diff --git a/.gitignore b/.gitignore index 93f758c4cd..60631726c2 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ extensions/vcproj64/* .vscode/* hemtt hemtt.exe +.hemtt/ tools/temp *.cache *.pbo diff --git a/addons/advanced_ballistics/RscTitles.hpp b/addons/advanced_ballistics/RscTitles.hpp index 8cf3b3b034..759f341a0c 100644 --- a/addons/advanced_ballistics/RscTitles.hpp +++ b/addons/advanced_ballistics/RscTitles.hpp @@ -42,7 +42,7 @@ class RscTitles { x="SafeZoneX + 0.001"; y="SafeZoneY + 0.001"; w=0.2; - h=0.2*4/3; + h="0.2*4/3"; size=0.034; sizeEx=0.027; text=""; diff --git a/addons/artillerytables/RscRangeTable.hpp b/addons/artillerytables/RscRangeTable.hpp index 3245b77af6..8e13e720d4 100644 --- a/addons/artillerytables/RscRangeTable.hpp +++ b/addons/artillerytables/RscRangeTable.hpp @@ -1,3 +1,5 @@ +#define ST_RIGHT 1 + class GVAR(rangeTableDialog) { idd = -1; movingEnable = 1; @@ -30,8 +32,8 @@ class GVAR(rangeTableDialog) { y = "3.76 * ((safeZoneH / 1.2) / 25) + (safezoneY + (safezoneH - (safeZoneH / 1.2)) / 2)"; w = "16.2634559672906 * (safeZoneH / 40)"; h = "20.24 * ((safeZoneH / 1.2) / 25)"; - columns[] = {(10/867),(86/867),(171/867),(238/867),(320/867),(405/867),(485/867),(546/867),(607/867),(668/867),(729/867),(790/867)}; - rowHeight = 0.015 * safeZoneH; + columns[] = {"10/867", "86/867", "171/867", "238/867", "320/867", "405/867", "485/867", "546/867", "607/867", "668/867", "729/867", "790/867"}; + rowHeight = "0.015 * safeZoneH"; sizeEx = "0.014 * safeZoneH"; font = "EtelkaMonospacePro"; drawSideArrows = 1; diff --git a/addons/artillerytables/RscTitles.hpp b/addons/artillerytables/RscTitles.hpp index 0da1131bc8..c26f302a00 100644 --- a/addons/artillerytables/RscTitles.hpp +++ b/addons/artillerytables/RscTitles.hpp @@ -36,7 +36,6 @@ class RscTitles { }; }; }; - }; }; }; diff --git a/addons/atragmx/RscTitles.hpp b/addons/atragmx/RscTitles.hpp index 896bc78ae0..6196346c57 100644 --- a/addons/atragmx/RscTitles.hpp +++ b/addons/atragmx/RscTitles.hpp @@ -14,12 +14,12 @@ class ATragMX_RscText { colorBackground[]={0,0,0,0}; colorText[]={0,0,0,1}; text=""; - x=0; - y=0; - h=0.037; - w=0.30; + x="0"; + y="0"; + h="0.037"; + w="0.30"; font="TahomaB"; - SizeEx=0.03; + SizeEx="0.03"; shadow=0; }; class ATragMX_RscButton { @@ -38,32 +38,32 @@ class ATragMX_RscButton { soundEscape[]={"",0,1}; type=1; style="0x02+0x100"; - x=0; - y=0; - w=0.03; - h=0.03; + x="0"; + y="0"; + w="0.03"; + h="0.03"; font="TahomaB"; - SizeEx=0.025; - offsetX=0.003; - offsetY=0.003; - offsetPressedX=0.0020; - offsetPressedY=0.0020; + SizeEx="0.025"; + offsetX="0.003"; + offsetY="0.003"; + offsetPressedX="0.0020"; + offsetPressedY="0.0020"; borderSize=0; shadow=0; }; class ATragMX_RscEdit { type=2; style=ST_RIGHT; - x=0; - y=0; - w=0.05; - h=0.03; + x="0"; + y="0"; + w="0.05"; + h="0.03"; colorDisabled[]={0,0,0,0.0}; colorBackground[]={0,0,0,0}; colorText[]={0,0,0,1}; colorSelection[]={0,0,0,0.25}; font="TahomaB"; - sizeEx=0.025; + sizeEx="0.025"; text=""; size=0.2; autocomplete=""; @@ -72,10 +72,10 @@ class ATragMX_RscEdit { class ATragMX_RscToolbox { type=6; style=ST_LEFT; - x=0; - y=0; - w=0.2; - h=0.03; + x="0"; + y="0"; + w="0.2"; + h="0.03"; colorDisabled[]={0,0,0,0.0}; colorBackground[]={1,1,1,1}; colorText[]={0,0,0,1}; @@ -86,7 +86,7 @@ class ATragMX_RscToolbox { colorTextDisable[]={0.4,0.4,0.4,1}; colorDisable[]={0.4,0.4,0.4,1}; font="TahomaB"; - sizeEx=0.027; + sizeEx="0.027"; rows=1; columns=2; strings[]={"Entry 1","Entry 2"}; @@ -98,7 +98,7 @@ class ATragMX_RscListBox { type=5; style=LB_TEXTURES; font="TahomaB"; - sizeEx=0.028; + sizeEx="0.028"; rowHeight=0.03; colorDisabled[]={0,0,0,0.0}; colorBackground[]={1,1,1,1}; @@ -109,14 +109,14 @@ class ATragMX_RscListBox { colorSelectBackground[]={0.925,0.925,0.925,1}; colorSelectBackground2[]={0.925,0.925,0.925,1}; period=0; - maxHistoryDelay=1.0; + maxHistoryDelay="1.0"; autoScrollSpeed=-1; - autoScrollDelay=5; + autoScrollDelay="5"; autoScrollRewind=0; soundSelect[]={"",0.09,1}; class ScrollBar { - width=0.05; + width="0.05"; color[]={0.15,0.21,0.23,0.3}; colorActive[]={0.15,0.21,0.23,0.3}; colorDisabled[]={0.15,0.21,0.23,0.3}; @@ -154,125 +154,125 @@ class ATragMX_Display { moving=1; type=0; font="TahomaB"; - SizeEX=0.025; + SizeEX="0.025"; idc=720000; style=48; - x=0.55*safezoneW+safezoneX-0.256; - y=0.265*safezoneH+safezoneY-0.1; - w=1.024; - h=1.024*4/3; + x="0.55*safezoneW+safezoneX-0.256"; + y="0.265*safezoneH+safezoneY-0.1"; + w="1.024"; + h="1.024*4/3"; colorBackground[]={1,1,1,1}; colorText[]={1,1,1,1}; - text=PATHTOF(UI\atrag_d.paa); + text=QPATHTOF(UI\atrag_d.paa); }; class POWER: ATragMX_RscButton { idc=-1; - x=0.55*safezoneW+safezoneX+0.145; - y=0.265*safezoneH+safezoneY+0.94; - w=0.045; - h=0.045*4/3; + x="0.55*safezoneW+safezoneX+0.145"; + y="0.265*safezoneH+safezoneY+0.94"; + w="0.045"; + h="0.045*4/3"; colorBackground[]={0,0,0,0.0}; action="closeDialog 0"; }; class BACK: POWER { idc=-1; - w=0.06; - x=0.55*safezoneW+safezoneX+0.3122; + w="0.06"; + x="0.55*safezoneW+safezoneX+0.3122"; action=QUOTE(call FUNC(init); call FUNC(update_target_selection)); }; class WINDOWS: ATragMX_RscButton { idc=-1; - x=0.55*safezoneW+safezoneX+0.130; - y=0.265*safezoneH+safezoneY+0.88; - w=0.035; - h=0.035*4/3; + x="0.55*safezoneW+safezoneX+0.130"; + y="0.265*safezoneH+safezoneY+0.88"; + w="0.035"; + h="0.035*4/3"; colorBackground[]={0,0,0,0.0}; }; class OK: WINDOWS { idc=-1; - x=0.55*safezoneW+safezoneX+0.347; - y=0.265*safezoneH+safezoneY+0.878; + x="0.55*safezoneW+safezoneX+0.347"; + y="0.265*safezoneH+safezoneY+0.878"; }; class TOP: ATragMX_RscButton { idc=-1; - x=0.55*safezoneW+safezoneX+0.242; - y=0.265*safezoneH+safezoneY+0.85; - w=0.03; - h=0.03; + x="0.55*safezoneW+safezoneX+0.242"; + y="0.265*safezoneH+safezoneY+0.85"; + w="0.03"; + h="0.03"; colorBackground[]={0,0,0,0.0}; action=QUOTE(-1 call FUNC(cycle_gun_list)); }; class BOTTOM: TOP { idc=-1; - y=0.265*safezoneH+safezoneY+0.955; + y="0.265*safezoneH+safezoneY+0.955"; action=QUOTE(+1 call FUNC(cycle_gun_list)); }; class LEFT: ATragMX_RscButton { idc=-1; - x=0.55*safezoneW+safezoneX+0.1925; - y=0.265*safezoneH+safezoneY+0.9; - w=0.05; - h=0.03; + x="0.55*safezoneW+safezoneX+0.1925"; + y="0.265*safezoneH+safezoneY+0.9"; + w="0.05"; + h="0.03"; colorBackground[]={0,0,0,0}; action=QUOTE(((4 + GVAR(currentTarget) - 1) % 4) call FUNC(change_target_slot)); }; class RIGHT: LEFT { idc=-1; - x=0.55*safezoneW+safezoneX+0.2725; + x="0.55*safezoneW+safezoneX+0.2725"; action=QUOTE(((4 + GVAR(currentTarget) + 1) % 4) call FUNC(change_target_slot)); }; class TOP_LEFT: ATragMX_RscButton { idc=-1; - x=0.55*safezoneW+safezoneX+0.162; - y=0.265*safezoneH+safezoneY+0.82; - w=0.031; - h=0.031*4/3; + x="0.55*safezoneW+safezoneX+0.162"; + y="0.265*safezoneH+safezoneY+0.82"; + w="0.031"; + h="0.031*4/3"; colorBackground[]={0,0,0,0.0}; }; class TOP_RIGHT: TOP_LEFT { idc=-1; - x=0.55*safezoneW+safezoneX+0.315; + x="0.55*safezoneW+safezoneX+0.315"; }; class TEXT_GUN_FRAME: ATragMX_RscText { idc=1001; style=64; - x=0.550*safezoneW+safezoneX+0.11; - y=0.265*safezoneH+safezoneY+0.25; - w=0.0925; - h=0.205; + x="0.550*safezoneW+safezoneX+0.11"; + y="0.265*safezoneH+safezoneY+0.25"; + w="0.0925"; + h="0.205"; text=""; }; class TEXT_ATMOSPHERE_FRAME: TEXT_GUN_FRAME { idc=1002; - x=0.550*safezoneW+safezoneX+0.205; + x="0.550*safezoneW+safezoneX+0.205"; }; class TEXT_TARGET_FRAME: TEXT_GUN_FRAME { idc=1003; - x=0.550*safezoneW+safezoneX+0.3; + x="0.550*safezoneW+safezoneX+0.3"; }; class TEXT_RESULT_FRAME: TEXT_GUN_FRAME { idc=1004; - x=0.550*safezoneW+safezoneX+0.11; - y=0.265*safezoneH+safezoneY+0.46; - w=0.2825; - h=0.15; + x="0.550*safezoneW+safezoneX+0.11"; + y="0.265*safezoneH+safezoneY+0.46"; + w="0.2825"; + h="0.15"; }; class TEXT_GUN_PROFILE: ATragMX_RscText { idc=1000; - x=0.550*safezoneW+safezoneX+0.11; - y=0.265*safezoneH+safezoneY+0.20; - w=0.18; - h=0.03; + x="0.550*safezoneW+safezoneX+0.11"; + y="0.265*safezoneH+safezoneY+0.20"; + w="0.18"; + h="0.03"; style=ST_LEFT; - sizeEx=0.025; + sizeEx="0.025"; text=""; }; class TEXT_D: ATragMX_RscButton { idc=600; - w=0.0231; - x=0.550*safezoneW+safezoneX+0.29; - y=0.265*safezoneH+safezoneY+0.20; + w="0.0231"; + x="0.550*safezoneW+safezoneX+0.29"; + y="0.265*safezoneH+safezoneY+0.20"; colorText[]={0,0,0,1}; colorDisabled[]={0.8,0.8,0.8,1}; colorBackgroundDisabled[]={0,0,0,1}; @@ -282,20 +282,20 @@ class ATragMX_Display { }; class TEXT_E: TEXT_D { idc=601; - x=0.550*safezoneW+safezoneX+0.3131; + x="0.550*safezoneW+safezoneX+0.3131"; text="E"; action=QUOTE(GVAR(currentUnit)=1; call FUNC(update_unit_selection)); }; class TEXT_M: TEXT_E { idc=602; - x=0.550*safezoneW+safezoneX+0.3362; + x="0.550*safezoneW+safezoneX+0.3362"; text="M"; action=QUOTE(GVAR(currentUnit)=2; call FUNC(update_unit_selection)); }; class TEXT_RANGE_CARD: TEXT_D { idc=603; - w=0.03; - x=0.550*safezoneW+safezoneX+0.36; + w="0.03"; + x="0.550*safezoneW+safezoneX+0.36"; colorBackground[]={0.15,0.21,0.23,0.3}; colorFocused[]={0.15,0.21,0.23,0.2}; text="RC"; @@ -304,9 +304,9 @@ class ATragMX_Display { class TEXT_GUN: ATragMX_RscButton { idc=4000; - w=0.0925; - x=0.550*safezoneW+safezoneX+0.11; - y=0.265*safezoneH+safezoneY+0.25; + w="0.0925"; + x="0.550*safezoneW+safezoneX+0.11"; + y="0.265*safezoneH+safezoneY+0.25"; colorBackground[]={0.15,0.21,0.23,0.3}; colorFocused[]={0.15,0.21,0.23,0.2}; text="Gun"; @@ -315,41 +315,41 @@ class ATragMX_Display { class TEXT_BORE_HEIGHT: TEXT_GUN_PROFILE { idc=10; style=ST_LEFT; - y=0.265*safezoneH+safezoneY+0.285; + y="0.265*safezoneH+safezoneY+0.285"; text="BH"; }; class TEXT_BORE_HEIGHT_OUTPUT: TEXT_BORE_HEIGHT { idc=100; style=ST_RIGHT; - w=0.058; - x=0.550*safezoneW+safezoneX+0.145; - y=0.265*safezoneH+safezoneY+0.285; + w="0.058"; + x="0.550*safezoneW+safezoneX+0.145"; + y="0.265*safezoneH+safezoneY+0.285"; }; class TEXT_BULLET_MASS: TEXT_BORE_HEIGHT { idc=11; style=ST_LEFT; - y=0.265*safezoneH+safezoneY+0.320; + y="0.265*safezoneH+safezoneY+0.320"; text="BW"; }; class TEXT_BULLET_MASS_OUTPUT: TEXT_BORE_HEIGHT_OUTPUT { idc=110; - y=0.265*safezoneH+safezoneY+0.320; + y="0.265*safezoneH+safezoneY+0.320"; }; class TEXT_AIR_FRICTION: TEXT_BORE_HEIGHT { idc=12; - y=0.265*safezoneH+safezoneY+0.355; + y="0.265*safezoneH+safezoneY+0.355"; text="C1"; }; class TEXT_AIR_FRICTION_OUTPUT: TEXT_BORE_HEIGHT_OUTPUT { idc=120; - y=0.265*safezoneH+safezoneY+0.355; + y="0.265*safezoneH+safezoneY+0.355"; }; class TEXT_MUZZLE_VELOCITY: ATragMX_RscButton { idc=13; style=0; - w=0.03; - x=0.550*safezoneW+safezoneX+0.11; - y=0.265*safezoneH+safezoneY+0.390; + w="0.03"; + x="0.550*safezoneW+safezoneX+0.11"; + y="0.265*safezoneH+safezoneY+0.390"; colorBackground[]={0.15,0.21,0.23,0.3}; colorFocused[]={0.15,0.21,0.23,0.2}; text="MV"; @@ -357,69 +357,69 @@ class ATragMX_Display { }; class TEXT_MUZZLE_VELOCITY_OUTPUT: TEXT_BORE_HEIGHT_OUTPUT { idc=130; - y=0.265*safezoneH+safezoneY+0.390; + y="0.265*safezoneH+safezoneY+0.390"; }; class TEXT_ZERO_RANGE: TEXT_BORE_HEIGHT { idc=14; - y=0.265*safezoneH+safezoneY+0.425; + y="0.265*safezoneH+safezoneY+0.425"; text="ZR"; }; class TEXT_ZERO_RANGE_OUTPUT: TEXT_BORE_HEIGHT_OUTPUT { idc=140; - y=0.265*safezoneH+safezoneY+0.425; + y="0.265*safezoneH+safezoneY+0.425"; }; class TEXT_ATMOSPHERE: TEXT_GUN { idc=4001; - x=0.550*safezoneW+safezoneX+0.205; + x="0.550*safezoneW+safezoneX+0.205"; text="Atmsphr"; action=QUOTE(0 call FUNC(toggle_atmo_env_data)); }; class TEXT_TEMPERATURE: TEXT_BULLET_MASS { idc=20; - x=0.550*safezoneW+safezoneX+0.20; + x="0.550*safezoneW+safezoneX+0.20"; text="Tmp"; }; class TEXT_TEMPERATURE_OUTPUT: TEXT_TEMPERATURE { idc=200; style=ST_RIGHT; - w=0.050; - x=0.550*safezoneW+safezoneX+0.245; - y=0.265*safezoneH+safezoneY+0.320; + w="0.050"; + x="0.550*safezoneW+safezoneX+0.245"; + y="0.265*safezoneH+safezoneY+0.320"; text=""; }; class TEXT_BAROMETRIC_PRESSURE: TEXT_TEMPERATURE { idc=21; - x=0.550*safezoneW+safezoneX+0.20; - y=0.265*safezoneH+safezoneY+0.355; + x="0.550*safezoneW+safezoneX+0.20"; + y="0.265*safezoneH+safezoneY+0.355"; text="BP"; }; class TEXT_BAROMETRIC_PRESSURE_OUTPUT: TEXT_TEMPERATURE_OUTPUT { idc=210; - y=0.265*safezoneH+safezoneY+0.355; + y="0.265*safezoneH+safezoneY+0.355"; }; class TEXT_RELATIVE_HUMIDITY: TEXT_BAROMETRIC_PRESSURE { idc=22; - y=0.265*safezoneH+safezoneY+0.390; + y="0.265*safezoneH+safezoneY+0.390"; text="RH"; }; class TEXT_RELATIVE_HUMIDITY_OUTPUT: TEXT_TEMPERATURE_OUTPUT { idc=220; - y=0.265*safezoneH+safezoneY+0.390; + y="0.265*safezoneH+safezoneY+0.390"; }; class TEXT_ALTITUDE: TEXT_BORE_HEIGHT { idc=23; - x=0.550*safezoneW+safezoneX+0.20; + x="0.550*safezoneW+safezoneX+0.20"; text="Alt"; }; class TEXT_ALTITUDE_OUTPUT: TEXT_TEMPERATURE_OUTPUT { idc=230; - y=0.265*safezoneH+safezoneY+0.285; + y="0.265*safezoneH+safezoneY+0.285"; }; class TEXT_TARGET_A: ATragMX_RscButton { idc=500; - w=0.0231; - x=0.550*safezoneW+safezoneX+0.205; - y=0.265*safezoneH+safezoneY+0.425; + w="0.0231"; + x="0.550*safezoneW+safezoneX+0.205"; + y="0.265*safezoneH+safezoneY+0.425"; colorText[]={0,0,0,1}; colorDisabled[]={0.8,0.8,0.8,1}; colorBackgroundDisabled[]={0,0,0,1}; @@ -429,180 +429,180 @@ class ATragMX_Display { }; class TEXT_TARGET_B: TEXT_TARGET_A { idc=501; - x=0.550*safezoneW+safezoneX+0.2281; + x="0.550*safezoneW+safezoneX+0.2281"; text="B"; action=QUOTE(1 call FUNC(change_target_slot)); }; class TEXT_TARGET_C: TEXT_TARGET_A { idc=502; - x=0.550*safezoneW+safezoneX+0.2512; + x="0.550*safezoneW+safezoneX+0.2512"; text="C"; action=QUOTE(2 call FUNC(change_target_slot)); }; class TEXT_TARGET_D: TEXT_TARGET_A { idc=503; - x=0.550*safezoneW+safezoneX+0.2743; + x="0.550*safezoneW+safezoneX+0.2743"; text="D"; action=QUOTE(3 call FUNC(change_target_slot)); }; class TEXT_TARGET: TEXT_GUN { idc=4002; - x=0.550*safezoneW+safezoneX+0.3; + x="0.550*safezoneW+safezoneX+0.3"; text="Target"; action=QUOTE(0 call FUNC(toggle_target_data)); }; class TEXT_WIND_SPEED: TEXT_BORE_HEIGHT { idc=30; - x=0.550*safezoneW+safezoneX+0.3; + x="0.550*safezoneW+safezoneX+0.3"; text="WS"; }; class TEXT_WIND_SPEED_OUTPUT: TEXT_BORE_HEIGHT_OUTPUT { idc=300; - w=0.058; - x=0.550*safezoneW+safezoneX+0.335; - y=0.265*safezoneH+safezoneY+0.285; + w="0.058"; + x="0.550*safezoneW+safezoneX+0.335"; + y="0.265*safezoneH+safezoneY+0.285"; text="0"; }; class TEXT_WIND_DIRECTION: TEXT_BULLET_MASS { idc=31; - x=0.550*safezoneW+safezoneX+0.3; + x="0.550*safezoneW+safezoneX+0.3"; text="WD"; }; class TEXT_WIND_DIRECTION_OUTPUT: TEXT_WIND_SPEED_OUTPUT { idc=310; - y=0.265*safezoneH+safezoneY+0.32; + y="0.265*safezoneH+safezoneY+0.32"; }; class TEXT_INCLINATION_ANGLE: TEXT_AIR_FRICTION { idc=32; - x=0.550*safezoneW+safezoneX+0.3; + x="0.550*safezoneW+safezoneX+0.3"; text="IA"; }; class TEXT_INCLINATION_ANGLE_OUTPUT: TEXT_WIND_SPEED_OUTPUT { idc=320; - y=0.265*safezoneH+safezoneY+0.355; + y="0.265*safezoneH+safezoneY+0.355"; }; class TEXT_TARGET_SPEED: TEXT_MUZZLE_VELOCITY { idc=33; - x=0.550*safezoneW+safezoneX+0.3; + x="0.550*safezoneW+safezoneX+0.3"; text="TS"; action=QUOTE(0 call FUNC(toggle_target_speed_assist)); }; class TEXT_TARGET_SPEED_OUTPUT: TEXT_WIND_SPEED_OUTPUT { idc=330; - y=0.265*safezoneH+safezoneY+0.39; + y="0.265*safezoneH+safezoneY+0.39"; }; class TEXT_TARGET_RANGE: TEXT_TARGET_SPEED { idc=34; - y=0.265*safezoneH+safezoneY+0.425; + y="0.265*safezoneH+safezoneY+0.425"; text="TR"; action=QUOTE(0 call FUNC(toggle_target_range_assist)); }; class TEXT_TARGET_RANGE_INPUT: TEXT_WIND_SPEED_OUTPUT { idc=340; - y=0.265*safezoneH+safezoneY+0.425; + y="0.265*safezoneH+safezoneY+0.425"; }; class TEXT_ELEVATION: TEXT_GUN_PROFILE { idc=40; - w=0.05; - x=0.550*safezoneW+safezoneX+0.115; - y=0.265*safezoneH+safezoneY+0.50; + w="0.05"; + x="0.550*safezoneW+safezoneX+0.115"; + y="0.265*safezoneH+safezoneY+0.50"; text="Elev"; }; class TEXT_ABSOLUTE: TEXT_GUN_PROFILE { idc=4003; - w=0.07; + w="0.07"; style=ST_CENTER; - x=0.550*safezoneW+safezoneX+0.17; - y=0.265*safezoneH+safezoneY+0.47; + x="0.550*safezoneW+safezoneX+0.17"; + y="0.265*safezoneH+safezoneY+0.47"; text="Abs"; }; class TEXT_RELATIVE: TEXT_ABSOLUTE { idc=4004; - x=0.550*safezoneW+safezoneX+0.245; + x="0.550*safezoneW+safezoneX+0.245"; text="Rel"; }; class TEXT_CURRENT: TEXT_ABSOLUTE { idc=4005; - x=0.550*safezoneW+safezoneX+0.32; + x="0.550*safezoneW+safezoneX+0.32"; text="Cur"; }; class TEXT_ELEVATION_OUTPUT_ABSOLUTE: ATragMX_RscText { idc=400; - style=ST_WITH_RECT+ST_RIGHT; - sizeEx=0.025; - w=0.065; - h=0.032; - x=0.550*safezoneW+safezoneX+0.17; - y=0.265*safezoneH+safezoneY+0.50; + style=QUOTE(ST_WITH_RECT+ST_RIGHT); + sizeEx="0.025"; + w="0.065"; + h="0.032"; + x="0.550*safezoneW+safezoneX+0.17"; + y="0.265*safezoneH+safezoneY+0.50"; text=""; }; class TEXT_ELEVATION_OUTPUT_RELATIVE: TEXT_ELEVATION_OUTPUT_ABSOLUTE { idc=401; - x=0.550*safezoneW+safezoneX+0.2465; + x="0.550*safezoneW+safezoneX+0.2465"; }; class TEXT_ELEVATION_INPUT_CURRENT: TEXT_ELEVATION_OUTPUT_ABSOLUTE { idc=402; - x=0.550*safezoneW+safezoneX+0.323; + x="0.550*safezoneW+safezoneX+0.323"; }; class TEXT_WINDAGE: TEXT_ELEVATION { idc=41; - y=0.265*safezoneH+safezoneY+0.535; + y="0.265*safezoneH+safezoneY+0.535"; text="Wind"; }; class TEXT_WINDAGE_OUTPUT_ABSOLUTE: TEXT_ELEVATION_OUTPUT_ABSOLUTE { idc=410; - y=0.265*safezoneH+safezoneY+0.535; + y="0.265*safezoneH+safezoneY+0.535"; }; class TEXT_WINDAGE_OUTPUT_RELATIVE: TEXT_WINDAGE_OUTPUT_ABSOLUTE { idc=411; - x=0.550*safezoneW+safezoneX+0.2465; + x="0.550*safezoneW+safezoneX+0.2465"; }; class TEXT_WINDAGE_INPUT_CURRENT: TEXT_WINDAGE_OUTPUT_ABSOLUTE { idc=412; - x=0.550*safezoneW+safezoneX+0.323; + x="0.550*safezoneW+safezoneX+0.323"; }; class TEXT_LEAD: TEXT_GUN { idc=42; - w=0.05; - x=0.550*safezoneW+safezoneX+0.115; - y=0.265*safezoneH+safezoneY+0.57; + w="0.05"; + x="0.550*safezoneW+safezoneX+0.115"; + y="0.265*safezoneH+safezoneY+0.57"; text="Lead"; action=QUOTE(GVAR(showWind2) = !GVAR(showWind2); call FUNC(update_result); call FUNC(update_target)); }; class TEXT_LEAD_OUTPUT: TEXT_ELEVATION_OUTPUT_ABSOLUTE { idc=420; - y=0.265*safezoneH+safezoneY+0.57; + y="0.265*safezoneH+safezoneY+0.57"; }; class TEXT_RESET_SCOPE_ZERO: TEXT_GUN { idc=4006; - w=0.07; + w="0.07"; style=ST_CENTER; colorBackground[]={0,0,0,0}; - x=0.550*safezoneW+safezoneX+0.2465; - y=0.265*safezoneH+safezoneY+0.57; + x="0.550*safezoneW+safezoneX+0.2465"; + y="0.265*safezoneH+safezoneY+0.57"; text="Reset"; action=QUOTE(call FUNC(reset_relative_click_memory)); }; class TEXT_UPDATE_SCOPE_ZERO: TEXT_RESET_SCOPE_ZERO { idc=4007; - x=0.550*safezoneW+safezoneX+0.323; + x="0.550*safezoneW+safezoneX+0.323"; text="Update"; action=QUOTE(call FUNC(update_relative_click_memory)); }; class TEXT_GUN_LIST: TEXT_GUN { idc=4008; style=ST_LEFT; - y=0.265*safezoneH+safezoneY+0.65; + y="0.265*safezoneH+safezoneY+0.65"; text="GunList"; action=QUOTE(call FUNC(toggle_gun_list)); }; class TEXT_SCOPE_UNIT: TEXT_GUN_LIST { idc=2000; style=ST_CENTER; - w=0.06; - x=0.550*safezoneW+safezoneX+0.205; + w="0.06"; + x="0.550*safezoneW+safezoneX+0.205"; colorBackground[]={0,0,0,0}; text="TMOA"; action=QUOTE(call FUNC(cycle_scope_unit)); @@ -610,15 +610,15 @@ class ATragMX_Display { class TEXT_SCOPE_CLICK_NUMBER: TEXT_GUN_LIST { idc=2001; style=ST_CENTER; - w=0.025; - x=0.550*safezoneW+safezoneX+0.27; + w="0.025"; + x="0.550*safezoneW+safezoneX+0.27"; text="4"; action=QUOTE(call FUNC(toggle_solution_setup)); }; class TEXT_OPTIONS: TEXT_GUN_LIST { idc=3000; style=ST_RIGHT; - x=0.550*safezoneW+safezoneX+0.3; + x="0.550*safezoneW+safezoneX+0.3"; text="Options"; action=QUOTE(false call FUNC(toggle_option_menu)); }; @@ -627,22 +627,22 @@ class ATragMX_Display { colorBackground[]={0.15,0.21,0.23,0.2}; colorBackgroundActive[]={0.15,0.21,0.23,0.2}; colorFocused[]={0.15,0.21,0.23,0.2}; - x=0.550*safezoneW+safezoneX+0.105; - y=0.265*safezoneH+safezoneY+0.17; - w=0.3; - h=0.535; - offsetPressedX=0.0; - offsetPressedY=0.0; + x="0.550*safezoneW+safezoneX+0.105"; + y="0.265*safezoneH+safezoneY+0.17"; + w="0.3"; + h="0.535"; + offsetPressedX="0.0"; + offsetPressedY="0.0"; action=QUOTE(false call FUNC(toggle_option_menu)); }; class TEXT_OPTIONS_LIST_OUTPUT: ATragMX_RscListBox { idc=3002; style=0; - w=0.17; - h=0.28; - x=0.550*safezoneW+safezoneX+0.225; - y=0.265*safezoneH+safezoneY+0.355; - sizeEx=0.025; + w="0.17"; + h="0.28"; + x="0.550*safezoneW+safezoneX+0.225"; + y="0.265*safezoneH+safezoneY+0.355"; + sizeEx="0.025"; onMouseButtonClick=QUOTE(true call FUNC(toggle_option_menu)); }; @@ -652,9 +652,9 @@ class ATragMX_Display { }; class TEXT_RANGE_CARD_SETUP: ATragMX_RscButton { idc=5001; - w=0.055675; - x=0.550*safezoneW+safezoneX+0.28; - y=0.265*safezoneH+safezoneY+0.20; + w="0.055675"; + x="0.550*safezoneW+safezoneX+0.28"; + y="0.265*safezoneH+safezoneY+0.20"; colorBackground[]={0.15,0.21,0.23,0.3}; colorFocused[]={0.15,0.21,0.23,0.2}; text="Setup"; @@ -662,32 +662,32 @@ class ATragMX_Display { }; class TEXT_RANGE_CARD_DONE: TEXT_RANGE_CARD_SETUP { idc=5002; - x=0.550*safezoneW+safezoneX+0.3362; + x="0.550*safezoneW+safezoneX+0.3362"; text="Done"; action=QUOTE(call FUNC(toggle_range_card)); }; class TEXT_RANGE_CARD_COLUMN_1_CAPTION: ATragMX_RscButton { idc=5003; style=ST_LEFT; - w=0.07; - x=0.550*safezoneW+safezoneX+0.11; - y=0.265*safezoneH+safezoneY+0.24; + w="0.07"; + x="0.550*safezoneW+safezoneX+0.11"; + y="0.265*safezoneH+safezoneY+0.24"; colorBackground[]={0.15,0.21,0.23,0.3}; text="Meters"; }; class TEXT_RANGE_CARD_COLUMN_2_CAPTION: TEXT_RANGE_CARD_COLUMN_1_CAPTION { idc=5004; - x=0.550*safezoneW+safezoneX+0.180625; + x="0.550*safezoneW+safezoneX+0.180625"; text="Elev"; }; class TEXT_RANGE_CARD_COLUMN_3_CAPTION: TEXT_RANGE_CARD_COLUMN_1_CAPTION { idc=5005; - x=0.550*safezoneW+safezoneX+0.25125; + x="0.550*safezoneW+safezoneX+0.25125"; text="Wind"; }; class TEXT_RANGE_CARD_COLUMN_4_CAPTION: TEXT_RANGE_CARD_COLUMN_1_CAPTION { idc=5006; - x=0.550*safezoneW+safezoneX+0.321875; + x="0.550*safezoneW+safezoneX+0.321875"; text="TmFlt"; action=QUOTE(call FUNC(cycle_range_card_columns)); }; @@ -696,98 +696,98 @@ class ATragMX_Display { columns[]={0.0, 0.225, 0.475, 0.7}; idcLeft=50061; idcRight=50062; - w=0.285; - h=0.42; - x=0.550*safezoneW+safezoneX+0.11; - y=0.265*safezoneH+safezoneY+0.27; + w="0.285"; + h="0.42"; + x="0.550*safezoneW+safezoneX+0.11"; + y="0.265*safezoneH+safezoneY+0.27"; }; class TEXT_GUN_LIST_OUTPUT: ATragMX_RscListNBox { idc=6000; columns[]={-0.05}; - w=0.16; - h=0.45; - x=0.550*safezoneW+safezoneX+0.11; - y=0.265*safezoneH+safezoneY+0.24; - sizeEx=0.018; + w="0.16"; + h="0.45"; + x="0.550*safezoneW+safezoneX+0.11"; + y="0.265*safezoneH+safezoneY+0.24"; + sizeEx="0.018"; colorSelectBackground[]={0.15,0.21,0.23,0.3}; colorSelectBackground2[]={0.15,0.21,0.23,0.3}; onLBDblClick=QUOTE(true call FUNC(toggle_gun_list)); }; class TEXT_GUN_LIST_COLUMN_CAPTION: TEXT_GUN_PROFILE { idc=6001; - w=0.16; + w="0.16"; colorBackground[]={0.15,0.21,0.23,0.3}; text="AtragGun.gun"; }; class TEXT_GUN_LIST_OPEN_GUN: ATragMX_RscButton { idc=6002; style=ST_RIGHT; - w=0.115; - x=0.550*safezoneW+safezoneX+0.28; - y=0.265*safezoneH+safezoneY+0.20; + w="0.115"; + x="0.550*safezoneW+safezoneX+0.28"; + y="0.265*safezoneH+safezoneY+0.20"; colorBackground[]={0.15,0.21,0.23,0.3}; colorFocused[]={0.15,0.21,0.23,0.2}; - sizeEx=0.024; + sizeEx="0.024"; text="Open Gun"; action=QUOTE(true call FUNC(toggle_gun_list)); }; class TEXT_GUN_LIST_SAVE_GUN: TEXT_GUN_LIST_OPEN_GUN { idc=6003; - y=0.265*safezoneH+safezoneY+0.24; + y="0.265*safezoneH+safezoneY+0.24"; text="Save Gun"; action=QUOTE(call FUNC(save_gun)); }; class TEXT_GUN_LIST_ADD_NEW_GUN: TEXT_GUN_LIST_OPEN_GUN { idc=6004; - y=0.265*safezoneH+safezoneY+0.28; + y="0.265*safezoneH+safezoneY+0.28"; text="Add New Gun"; action=QUOTE(false call FUNC(show_gun_list); true call FUNC(show_add_new_gun)); }; class TEXT_GUN_LIST_DELETE_GUN: TEXT_GUN_LIST_OPEN_GUN { idc=6005; - y=0.265*safezoneH+safezoneY+0.34; + y="0.265*safezoneH+safezoneY+0.34"; text="Delete Gun"; action=QUOTE(call FUNC(delete_gun)); }; class TEXT_GUN_LIST_NOTE: TEXT_GUN_LIST_OPEN_GUN { idc=6006; - y=0.265*safezoneH+safezoneY+0.40; + y="0.265*safezoneH+safezoneY+0.40"; text="Note"; }; class TEXT_GUN_LIST_DONE: TEXT_GUN_LIST_OPEN_GUN { idc=6007; - y=0.265*safezoneH+safezoneY+0.65; + y="0.265*safezoneH+safezoneY+0.65"; text="Done"; action=QUOTE(false call FUNC(toggle_gun_list)); }; class TEXT_TARGET_RANGE_ASSIST_CAPTION: ATragMX_RscText { idc=7000; - style=16+0x200; + style="16+0x200"; lineSpacing=1.0; - x=0.550*safezoneW+safezoneX+0.11; - y=0.265*safezoneH+safezoneY+0.24; - w=0.29; - h=0.10; - sizeEx=0.022; + x="0.550*safezoneW+safezoneX+0.11"; + y="0.265*safezoneH+safezoneY+0.24"; + w="0.29"; + h="0.10"; + sizeEx="0.022"; text="When using WIDTH to size a target, UP/Down Angle does not effect range calculation but will effect bullet drop."; }; class TEXT_TARGET_RANGE_ASSIST_MEASUREMENT_METHOD: TEXT_TARGET_RANGE_ASSIST_CAPTION { idc=7001; style=ST_LEFT; - x=0.550*safezoneW+safezoneX+0.115; - y=0.265*safezoneH+safezoneY+0.35; - w=0.12; - h=0.03; - sizeEx=0.027; + x="0.550*safezoneW+safezoneX+0.115"; + y="0.265*safezoneH+safezoneY+0.35"; + w="0.12"; + h="0.03"; + sizeEx="0.027"; text="Using Target:"; }; class TEXT_TARGET_RANGE_ASSIST_WIDTH_HEIGHT: ATragMX_RscToolbox { idc=7002; - w=0.14; - x=0.550*safezoneW+safezoneX+0.24; - y=0.265*safezoneH+safezoneY+0.35; + w="0.14"; + x="0.550*safezoneW+safezoneX+0.24"; + y="0.265*safezoneH+safezoneY+0.35"; strings[]={"Height","Width"}; values[]={1,0}; onToolBoxSelChanged=QUOTE(GVAR(rangeAssistUseTargetHeight) = ((_this select 1) == 0)); @@ -795,89 +795,89 @@ class ATragMX_Display { class TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE: TEXT_TARGET_RANGE_ASSIST_MEASUREMENT_METHOD { idc=7003; style=ST_RIGHT; - x=0.550*safezoneW+safezoneX+0.092; - y=0.265*safezoneH+safezoneY+0.4; - w=0.128; + x="0.550*safezoneW+safezoneX+0.092"; + y="0.265*safezoneH+safezoneY+0.4"; + w="0.128"; text="Target Size"; }; class TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE { idc=7004; - y=0.265*safezoneH+safezoneY+0.45; + y="0.265*safezoneH+safezoneY+0.45"; text="Image Size"; }; class TEXT_TARGET_RANGE_ASSIST_ANGLE: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE { idc=7005; - y=0.265*safezoneH+safezoneY+0.5; + y="0.265*safezoneH+safezoneY+0.5"; text="Angle"; }; class TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE { idc=7006; - y=0.265*safezoneH+safezoneY+0.55; + y="0.265*safezoneH+safezoneY+0.55"; text="Est Range"; }; class TEXT_TARGET_RANGE_ASSIST_CALC_1: TEXT_MUZZLE_VELOCITY { idc=7007; - w=0.0231; - x=0.550*safezoneW+safezoneX+0.22; - y=0.265*safezoneH+safezoneY+0.4; - sizeEx=0.03; + w="0.0231"; + x="0.550*safezoneW+safezoneX+0.22"; + y="0.265*safezoneH+safezoneY+0.4"; + sizeEx="0.03"; text="!"; action=QUOTE(0 call FUNC(calculate_target_range_assist)); }; class TEXT_TARGET_RANGE_ASSIST_CALC_2: TEXT_TARGET_RANGE_ASSIST_CALC_1 { idc=7008; - y=0.265*safezoneH+safezoneY+0.45; + y="0.265*safezoneH+safezoneY+0.45"; action=QUOTE(1 call FUNC(calculate_target_range_assist)); }; class TEXT_TARGET_RANGE_ASSIST_CALC_3: TEXT_TARGET_RANGE_ASSIST_CALC_1 { idc=7009; - y=0.265*safezoneH+safezoneY+0.55; + y="0.265*safezoneH+safezoneY+0.55"; action=QUOTE(2 call FUNC(calculate_target_range_assist)); }; class TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_INPUT: ATragMX_RscEdit { idc=7010; - w=0.065; - x=0.550*safezoneW+safezoneX+0.2475; - y=0.265*safezoneH+safezoneY+0.4; + w="0.065"; + x="0.550*safezoneW+safezoneX+0.2475"; + y="0.265*safezoneH+safezoneY+0.4"; }; class TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE_INPUT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_INPUT { idc=7011; - y=0.265*safezoneH+safezoneY+0.45; + y="0.265*safezoneH+safezoneY+0.45"; }; class TEXT_TARGET_RANGE_ASSIST_ANGLE_INPUT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_INPUT { idc=7012; - y=0.265*safezoneH+safezoneY+0.5; + y="0.265*safezoneH+safezoneY+0.5"; }; class TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE_INPUT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_INPUT { idc=7013; - y=0.265*safezoneH+safezoneY+0.55; + y="0.265*safezoneH+safezoneY+0.55"; }; class TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_UNIT: TEXT_TARGET_RANGE_ASSIST_CALC_1 { idc=7014; - w=0.07; - x=0.550*safezoneW+safezoneX+0.32; + w="0.07"; + x="0.550*safezoneW+safezoneX+0.32"; text="cm"; action=QUOTE(call FUNC(cycle_target_size_units)); }; class TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE_UNIT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_UNIT { idc=7015; - y=0.265*safezoneH+safezoneY+0.45; + y="0.265*safezoneH+safezoneY+0.45"; text="MIL"; action=QUOTE(call FUNC(cycle_image_size_units)); }; class TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE_UNIT: TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE { idc=7016; style=ST_LEFT; - w=0.07; - x=0.550*safezoneW+safezoneX+0.32; + w="0.07"; + x="0.550*safezoneW+safezoneX+0.32"; text="Meters"; }; class TEXT_TARGET_RANGE_ASSIST_DONE: ATragMX_RscButton { idc=7017; style=ST_CENTER; - w=0.07; - x=0.550*safezoneW+safezoneX+0.11; - y=0.265*safezoneH+safezoneY+0.60; + w="0.07"; + x="0.550*safezoneW+safezoneX+0.11"; + y="0.265*safezoneH+safezoneY+0.60"; colorBackground[]={0.15,0.21,0.23,0.3}; colorFocused[]={0.15,0.21,0.23,0.2}; text="Done"; @@ -885,41 +885,41 @@ class ATragMX_Display { }; class TEXT_TARGET_RANGE_ASSIST_CANCEL: TEXT_TARGET_RANGE_ASSIST_DONE { idc=7018; - x=0.550*safezoneW+safezoneX+0.180625; + x="0.550*safezoneW+safezoneX+0.180625"; text="Cancel"; action=QUOTE(0 call FUNC(toggle_target_range_assist)); }; class TEXT_TARGET_RANGE_ASSIST_PREV: TEXT_TARGET_RANGE_ASSIST_DONE { idc=7019; - x=0.550*safezoneW+safezoneX+0.25125; + x="0.550*safezoneW+safezoneX+0.25125"; text="Prev"; action=""; }; class TEXT_TARGET_RANGE_ASSIST_NEXT: TEXT_TARGET_RANGE_ASSIST_DONE { idc=7020; - x=0.550*safezoneW+safezoneX+0.321875; + x="0.550*safezoneW+safezoneX+0.321875"; text="Next"; action=""; }; class TEXT_TARGET_SPEED_ASSIST_TARGET_RANGE: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE { idc=8000; - x=0.550*safezoneW+safezoneX+0.12; + x="0.550*safezoneW+safezoneX+0.12"; text="Target Range"; }; class TEXT_TARGET_SPEED_ASSIST_NUM_TICKS: TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE { idc=8001; - x=0.550*safezoneW+safezoneX+0.12; + x="0.550*safezoneW+safezoneX+0.12"; text="Num Ticks"; }; class TEXT_TARGET_SPEED_ASSIST_TIME: TEXT_TARGET_RANGE_ASSIST_ANGLE { idc=8002; - x=0.550*safezoneW+safezoneX+0.12; + x="0.550*safezoneW+safezoneX+0.12"; text="Time (secs)"; }; class TEXT_TARGET_SPEED_ASSIST_TARGET_ESTIMATED_SPEED: TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE { idc=8003; - x=0.550*safezoneW+safezoneX+0.12; + x="0.550*safezoneW+safezoneX+0.12"; text="Est Speed"; }; class TEXT_TARGET_SPEED_ASSIST_TARGET_RANGE_INPUT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_INPUT { @@ -936,15 +936,15 @@ class ATragMX_Display { }; class TEXT_TARGET_SPEED_ASSIST_TARGET_ESTIMATED_SPEED_OUTPUT: TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE { idc=8007; - w=0.065; - x=0.550*safezoneW+safezoneX+0.2475; - y=0.265*safezoneH+safezoneY+0.55; + w="0.065"; + x="0.550*safezoneW+safezoneX+0.2475"; + y="0.265*safezoneH+safezoneY+0.55"; colorBackground[]={0.15,0.21,0.23,0.3}; text="0"; }; class TEXT_TARGET_SPEED_ASSIST_TARGET_RANGE_UNIT: TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE_UNIT { idc=8008; - y=0.265*safezoneH+safezoneY+0.4; + y="0.265*safezoneH+safezoneY+0.4"; text="Meters"; }; class TEXT_TARGET_SPEED_ASSIST_NUM_TICKS_UNIT: TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE_UNIT { @@ -954,7 +954,7 @@ class ATragMX_Display { }; class TEXT_TARGET_SPEED_ASSIST_TIMER_START: TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE_UNIT { idc=8010; - y=0.265*safezoneH+safezoneY+0.5; + y="0.265*safezoneH+safezoneY+0.5"; text="Start"; action=QUOTE(call FUNC(target_speed_assist_timer)); }; @@ -979,31 +979,31 @@ class ATragMX_Display { class TEXT_TARGET_SPEED_ASSIST_TIMER_STOP_BACKGROUND: ATragMX_RscButton { idc=9000; - w=0.285; - h=0.49; - x=0.550*safezoneW+safezoneX+0.11; - y=0.265*safezoneH+safezoneY+0.2; + w="0.285"; + h="0.49"; + x="0.550*safezoneW+safezoneX+0.11"; + y="0.265*safezoneH+safezoneY+0.2"; colorBackground[]={0,0,0,0}; colorBackgroundActive[]={0,0,0,0}; action=QUOTE(GVAR(speedAssistTimer)=false); }; class TEXT_TARGET_SPEED_ASSIST_TIME_OUTPUT: ATragMX_RscText { idc=9001; - x=0.550*safezoneW+safezoneX+0.22; - y=0.265*safezoneH+safezoneY+0.51; - w=0.08; - h=0.09; + x="0.550*safezoneW+safezoneX+0.22"; + y="0.265*safezoneH+safezoneY+0.51"; + w="0.08"; + h="0.09"; style=ST_CENTER; - sizeEx=0.05; + sizeEx="0.05"; text="0.0"; }; class TEXT_TARGET_SPEED_ASSIST_TIMER_STOP: ATragMX_RscButton { idc=9002; style=ST_CENTER; - w=0.07; - h=0.04; - x=0.550*safezoneW+safezoneX+0.225; - y=0.265*safezoneH+safezoneY+0.60; + w="0.07"; + h="0.04"; + x="0.550*safezoneW+safezoneX+0.225"; + y="0.265*safezoneH+safezoneY+0.60"; colorBackground[]={0.15,0.21,0.23,0.3}; colorFocused[]={0.15,0.21,0.23,0.2}; text="Stop"; @@ -1012,17 +1012,17 @@ class ATragMX_Display { class TEXT_RANGE_CARD_SETUP_START_RANGE: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE { idc=10000; - x=0.550*safezoneW+safezoneX+0.12; + x="0.550*safezoneW+safezoneX+0.12"; text="Start Range"; }; class TEXT_RANGE_CARD_SETUP_END_RANGE: TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE { idc=10001; - x=0.550*safezoneW+safezoneX+0.12; + x="0.550*safezoneW+safezoneX+0.12"; text="End Range"; }; class TEXT_RANGE_CARD_SETUP_INCREMENT: TEXT_TARGET_RANGE_ASSIST_ANGLE { idc=10002; - x=0.550*safezoneW+safezoneX+0.12; + x="0.550*safezoneW+safezoneX+0.12"; text="Increment"; }; class TEXT_RANGE_CARD_SETUP_START_RANGE_INPUT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_INPUT { @@ -1055,20 +1055,20 @@ class ATragMX_Display { class TEXT_ADD_NEW_GUN_CAPTION: ATragMX_RscText { idc=11000; style=ST_LEFT; - w=0.25; - h=0.04; - x=0.550*safezoneW+safezoneX+0.12; - y=0.265*safezoneH+safezoneY+0.24; - sizeEx=0.025; + w="0.25"; + h="0.04"; + x="0.550*safezoneW+safezoneX+0.12"; + y="0.265*safezoneH+safezoneY+0.24"; + sizeEx="0.025"; text="New Gun Name"; }; class TEXT_ADD_NEW_GUN_GUN_NAME_INPUT: ATragMX_RscEdit { idc=11001; style=ST_LEFT; - w=0.225; - h=0.04; - x=0.550*safezoneW+safezoneX+0.12; - y=0.265*safezoneH+safezoneY+0.28; + w="0.225"; + h="0.04"; + x="0.550*safezoneW+safezoneX+0.12"; + y="0.265*safezoneH+safezoneY+0.28"; text=""; onKeyDown=QUOTE(call FUNC(trim_gun_name)); onKeyUp=QUOTE(call FUNC(trim_gun_name)); @@ -1076,10 +1076,10 @@ class ATragMX_Display { class TEXT_ADD_NEW_GUN_OK: ATragMX_RscButton { idc=11002; style=ST_CENTER; - w=0.1; - h=0.04; - x=0.550*safezoneW+safezoneX+0.12; - y=0.265*safezoneH+safezoneY+0.33; + w="0.1"; + h="0.04"; + x="0.550*safezoneW+safezoneX+0.12"; + y="0.265*safezoneH+safezoneY+0.33"; colorBackground[]={0.15,0.21,0.23,0.3}; colorFocused[]={0.15,0.21,0.23,0.2}; text="OK"; @@ -1087,82 +1087,82 @@ class ATragMX_Display { }; class TEXT_ADD_NEW_GUN_CANCEL: TEXT_ADD_NEW_GUN_OK { idc=11003; - x=0.550*safezoneW+safezoneX+0.245; + x="0.550*safezoneW+safezoneX+0.245"; text="Cancel"; action=QUOTE(false call FUNC(show_add_new_gun); true call FUNC(show_gun_list)); }; class TEXT_GUN_AMMO_DATA_BORE_HEIGHT: TEXT_BORE_HEIGHT { idc=12000; - w=0.22; - y=0.265*safezoneH+safezoneY+0.28; + w="0.22"; + y="0.265*safezoneH+safezoneY+0.28"; text="Bore (cm)"; }; class TEXT_GUN_AMMO_DATA_BORE_HEIGHT_INPUT: ATragMX_RscEdit { idc=120000; - w=0.06; - x=0.550*safezoneW+safezoneX+0.335; - y=0.265*safezoneH+safezoneY+0.28; + w="0.06"; + x="0.550*safezoneW+safezoneX+0.335"; + y="0.265*safezoneH+safezoneY+0.28"; }; class TEXT_GUN_AMMO_DATA_BULLET_MASS: TEXT_GUN_AMMO_DATA_BORE_HEIGHT { idc=12001; - y=0.265*safezoneH+safezoneY+0.320; + y="0.265*safezoneH+safezoneY+0.320"; text="Bullet Weight (grams)"; }; class TEXT_GUN_AMMO_DATA_BULLET_MASS_INPUT: TEXT_GUN_AMMO_DATA_BORE_HEIGHT_INPUT { idc=120010; - y=0.265*safezoneH+safezoneY+0.320; + y="0.265*safezoneH+safezoneY+0.320"; }; class TEXT_GUN_AMMO_DATA_BULLET_DIAMETER: TEXT_GUN_AMMO_DATA_BORE_HEIGHT { idc=12002; - y=0.265*safezoneH+safezoneY+0.360; + y="0.265*safezoneH+safezoneY+0.360"; text="Bullet Diam (cm)"; }; class TEXT_GUN_AMMO_DATA_BULLET_DIAMETER_INPUT: TEXT_GUN_AMMO_DATA_BORE_HEIGHT_INPUT { idc=120020; - y=0.265*safezoneH+safezoneY+0.360; + y="0.265*safezoneH+safezoneY+0.360"; }; class TEXT_GUN_AMMO_DATA_AIR_FRICTION: TEXT_GUN_AMMO_DATA_BORE_HEIGHT { idc=12003; - y=0.265*safezoneH+safezoneY+0.400; + y="0.265*safezoneH+safezoneY+0.400"; text="C1 Coefficient"; }; class TEXT_GUN_AMMO_DATA_AIR_FRICTION_INPUT: TEXT_GUN_AMMO_DATA_BORE_HEIGHT_INPUT { idc=120030; - y=0.265*safezoneH+safezoneY+0.400; + y="0.265*safezoneH+safezoneY+0.400"; }; class TEXT_GUN_AMMO_DATA_RIFLE_TWIST: TEXT_GUN_AMMO_DATA_BORE_HEIGHT { idc=12004; - y=0.265*safezoneH+safezoneY+0.440; + y="0.265*safezoneH+safezoneY+0.440"; text="Rifle Twist (cm/trn)"; }; class TEXT_GUN_AMMO_DATA_RIFLE_TWIST_INPUT: TEXT_GUN_AMMO_DATA_BORE_HEIGHT_INPUT { idc=120040; - y=0.265*safezoneH+safezoneY+0.440; + y="0.265*safezoneH+safezoneY+0.440"; }; class TEXT_GUN_AMMO_DATA_MUZZLE_VELOCITY: TEXT_GUN_AMMO_DATA_BORE_HEIGHT { idc=12005; - y=0.265*safezoneH+safezoneY+0.480; + y="0.265*safezoneH+safezoneY+0.480"; text="Muzzle Velocity (m/s)"; }; class TEXT_GUN_AMMO_DATA_MUZZLE_VELOCITY_INPUT: TEXT_GUN_AMMO_DATA_BORE_HEIGHT_INPUT { idc=120050; - y=0.265*safezoneH+safezoneY+0.480; + y="0.265*safezoneH+safezoneY+0.480"; }; class TEXT_GUN_AMMO_DATA_ZERO_RANGE: TEXT_GUN_AMMO_DATA_BORE_HEIGHT { idc=12006; - y=0.265*safezoneH+safezoneY+0.520; + y="0.265*safezoneH+safezoneY+0.520"; text="Zero Range (meters)"; }; class TEXT_GUN_AMMO_DATA_ZERO_RANGE_INPUT: TEXT_GUN_AMMO_DATA_BORE_HEIGHT_INPUT { idc=120060; - y=0.265*safezoneH+safezoneY+0.520; + y="0.265*safezoneH+safezoneY+0.520"; }; class TEXT_GUN_AMMO_DATA_ZERO_RANGE_METER_INDICATOR: TEXT_GUN_AMMO_DATA_BORE_HEIGHT { idc=120061; - w=0.05; - x=0.550*safezoneW+safezoneX+0.315; - y=0.265*safezoneH+safezoneY+0.520; + w="0.05"; + x="0.550*safezoneW+safezoneX+0.315"; + y="0.265*safezoneH+safezoneY+0.520"; text=""; }; class TEXT_GUN_AMMO_DATA_DONE: TEXT_TARGET_SPEED_ASSIST_DONE { @@ -1182,63 +1182,63 @@ class ATragMX_Display { class TEXT_ATMO_ENV_DATA_DEFAULT: TEXT_LEAD { idc=13000; - w=0.08; - x=0.550*safezoneW+safezoneX+0.15; - y=0.265*safezoneH+safezoneY+0.320; + w="0.08"; + x="0.550*safezoneW+safezoneX+0.15"; + y="0.265*safezoneH+safezoneY+0.320"; text="Default"; action=QUOTE(call FUNC(restore_atmo_default)); }; class TEXT_ATMO_ENV_DATA_AT: TEXT_TARGET_A { idc=13001; - w=0.04; - x=0.550*safezoneW+safezoneX+0.24; - y=0.265*safezoneH+safezoneY+0.320; + w="0.04"; + x="0.550*safezoneW+safezoneX+0.24"; + y="0.265*safezoneH+safezoneY+0.320"; text="AT"; action=QUOTE(GVAR(atmosphereModeTBH) = false; call FUNC(update_atmo_selection)); }; class TEXT_ATMO_ENV_DATA_TBH: TEXT_ATMO_ENV_DATA_AT { idc=13002; - x=0.550*safezoneW+safezoneX+0.28; + x="0.550*safezoneW+safezoneX+0.28"; text="TBH"; action=QUOTE(GVAR(atmosphereModeTBH) = true; call FUNC(update_atmo_selection)); }; class TEXT_ATMO_ENV_DATA_ALTITUDE: TEXT_GUN_AMMO_DATA_BORE_HEIGHT { idc=13003; - x=0.550*safezoneW+safezoneX+0.115; - y=0.265*safezoneH+safezoneY+0.400; + x="0.550*safezoneW+safezoneX+0.115"; + y="0.265*safezoneH+safezoneY+0.400"; text="Altitude (ft)"; }; class TEXT_ATMO_ENV_DATA_ALTITUDE_INPUT: TEXT_GUN_AMMO_DATA_BORE_HEIGHT_INPUT { idc=130030; - x=0.550*safezoneW+safezoneX+0.330; - y=0.265*safezoneH+safezoneY+0.400; + x="0.550*safezoneW+safezoneX+0.330"; + y="0.265*safezoneH+safezoneY+0.400"; }; class TEXT_ATMO_ENV_DATA_TEMPERATURE: TEXT_ATMO_ENV_DATA_ALTITUDE { idc=13004; - y=0.265*safezoneH+safezoneY+0.440; + y="0.265*safezoneH+safezoneY+0.440"; text="temperature (F)"; }; class TEXT_ATMO_ENV_DATA_TEMPERATURE_INPUT: TEXT_ATMO_ENV_DATA_ALTITUDE_INPUT { idc=130040; - y=0.265*safezoneH+safezoneY+0.440; + y="0.265*safezoneH+safezoneY+0.440"; }; class TEXT_ATMO_ENV_DATA_BAROMETRIC_PRESSURE: TEXT_ATMO_ENV_DATA_ALTITUDE { idc=13005; - y=0.265*safezoneH+safezoneY+0.480; + y="0.265*safezoneH+safezoneY+0.480"; text="Barom Pres (in.merc.)"; }; class TEXT_ATMO_ENV_DATA_BAROMETRIC_PRESSURE_INPUT: TEXT_ATMO_ENV_DATA_ALTITUDE_INPUT { idc=130050; - y=0.265*safezoneH+safezoneY+0.480; + y="0.265*safezoneH+safezoneY+0.480"; }; class TEXT_ATMO_ENV_DATA_RELATIVE_HUMIDITY: TEXT_ATMO_ENV_DATA_ALTITUDE { idc=13006; - y=0.265*safezoneH+safezoneY+0.520; + y="0.265*safezoneH+safezoneY+0.520"; text="Relative Humidity (%)"; }; class TEXT_ATMO_ENV_DATA_RELATIVE_HUMIDITY_INPUT: TEXT_ATMO_ENV_DATA_ALTITUDE_INPUT { idc=130060; - y=0.265*safezoneH+safezoneY+0.520; + y="0.265*safezoneH+safezoneY+0.520"; }; class TEXT_ATMO_ENV_DATA_DONE: TEXT_TARGET_SPEED_ASSIST_DONE { idc=13007; @@ -1257,144 +1257,144 @@ class ATragMX_Display { class TEXT_ATMO_ENV_DATA_CALC_METHOD: TEXT_GUN_AMMO_DATA_BORE_HEIGHT { idc=13011; style=64; - w=0.14; - h=0.07; - x=0.550*safezoneW+safezoneX+0.235; - y=0.265*safezoneH+safezoneY+0.29; + w="0.14"; + h="0.07"; + x="0.550*safezoneW+safezoneX+0.235"; + y="0.265*safezoneH+safezoneY+0.29"; text="Calc Method"; }; class TEXT_TARGET_DATA_LATITUDE: TEXT_BORE_HEIGHT { idc=14000; - w=0.22; - y=0.265*safezoneH+safezoneY+0.28; + w="0.22"; + y="0.265*safezoneH+safezoneY+0.28"; text="Latitude"; }; class TEXT_TARGET_DATA_LATITUDE_INPUT: ATragMX_RscEdit { idc=140000; - w=0.06; - x=0.550*safezoneW+safezoneX+0.335; - y=0.265*safezoneH+safezoneY+0.28; + w="0.06"; + x="0.550*safezoneW+safezoneX+0.335"; + y="0.265*safezoneH+safezoneY+0.28"; }; class TEXT_TARGET_DATA_DIR_OF_FIRE: TEXT_TARGET_DATA_LATITUDE { idc=14001; - y=0.265*safezoneH+safezoneY+0.320; + y="0.265*safezoneH+safezoneY+0.320"; text="Dir of Fire (deg from N)"; }; class TEXT_TARGET_DATA_DIR_OF_FIRE_INPUT: TEXT_TARGET_DATA_LATITUDE_INPUT { idc=140010; - y=0.265*safezoneH+safezoneY+0.320; + y="0.265*safezoneH+safezoneY+0.320"; }; class TEXT_TARGET_DATA_WIND_SPEED: TEXT_TARGET_DATA_LATITUDE { idc=14002; - w=1.2; - y=0.265*safezoneH+safezoneY+0.360; + w="1.2"; + y="0.265*safezoneH+safezoneY+0.360"; text="Wind Speed (m/s)"; }; class TEXT_TARGET_DATA_WIND_SPEED_1: TEXT_TARGET_DATA_LATITUDE { idc=141020; colorText[]={0,0,0,0.6}; - w=0.05; - h=0.03; - sizeEx=0.025; - x=0.550*safezoneW+safezoneX+0.270; - y=0.265*safezoneH+safezoneY+0.357; + w="0.05"; + h="0.03"; + sizeEx="0.025"; + x="0.550*safezoneW+safezoneX+0.270"; + y="0.265*safezoneH+safezoneY+0.357"; text="1"; }; class TEXT_TARGET_DATA_WIND_SPEED_INPUT_1: TEXT_TARGET_DATA_LATITUDE_INPUT { idc=140020; - w=0.045; - x=0.550*safezoneW+safezoneX+0.290; - y=0.265*safezoneH+safezoneY+0.360; + w="0.045"; + x="0.550*safezoneW+safezoneX+0.290"; + y="0.265*safezoneH+safezoneY+0.360"; }; class TEXT_TARGET_DATA_WIND_SPEED_2: TEXT_TARGET_DATA_WIND_SPEED_1 { idc=141021; - x=0.550*safezoneW+safezoneX+0.330; + x="0.550*safezoneW+safezoneX+0.330"; text="2"; }; class TEXT_TARGET_DATA_WIND_SPEED_INPUT_2: TEXT_TARGET_DATA_LATITUDE_INPUT { idc=140021; - w=0.045; - x=0.550*safezoneW+safezoneX+0.350; - y=0.265*safezoneH+safezoneY+0.360; + w="0.045"; + x="0.550*safezoneW+safezoneX+0.350"; + y="0.265*safezoneH+safezoneY+0.360"; }; class TEXT_TARGET_DATA_WIND_DIRECTION: TEXT_TARGET_DATA_LATITUDE { idc=14003; - y=0.265*safezoneH+safezoneY+0.400; + y="0.265*safezoneH+safezoneY+0.400"; text="Wind Direction (clock)"; }; class TEXT_TARGET_DATA_WIND_DIRECTION_INPUT: TEXT_TARGET_DATA_LATITUDE_INPUT { idc=140030; - y=0.265*safezoneH+safezoneY+0.400; + y="0.265*safezoneH+safezoneY+0.400"; }; class TEXT_TARGET_DATA_INCLINATION_ANGLE: TEXT_TARGET_DATA_LATITUDE { idc=14004; - w=1.2; - y=0.265*safezoneH+safezoneY+0.440; + w="1.2"; + y="0.265*safezoneH+safezoneY+0.440"; text="Inclination Angle"; }; class TEXT_TARGET_DATA_INCLINATION_ANGLE_COSINE: TEXT_TARGET_DATA_LATITUDE { idc=141041; colorText[]={0,0,0,0.6}; - w=0.05; - h=0.03; - sizeEx=0.025; - x=0.550*safezoneW+safezoneX+0.270; - y=0.265*safezoneH+safezoneY+0.437; + w="0.05"; + h="0.03"; + sizeEx="0.025"; + x="0.550*safezoneW+safezoneX+0.270"; + y="0.265*safezoneH+safezoneY+0.437"; text="c"; }; class TEXT_TARGET_DATA_INCLINATION_ANGLE_INPUT_COSINE: TEXT_TARGET_DATA_LATITUDE_INPUT { idc=140041; - w=0.045; - x=0.550*safezoneW+safezoneX+0.290; - y=0.265*safezoneH+safezoneY+0.440; + w="0.045"; + x="0.550*safezoneW+safezoneX+0.290"; + y="0.265*safezoneH+safezoneY+0.440"; onKeyUp=QUOTE(if (_this select 1 == 28) then {0 call FUNC(update_inclination_angle)}); }; class TEXT_TARGET_DATA_INCLINATION_ANGLE_DEGREE: TEXT_TARGET_DATA_INCLINATION_ANGLE_COSINE { idc=141040; - x=0.550*safezoneW+safezoneX+0.330; + x="0.550*safezoneW+safezoneX+0.330"; text="d"; }; class TEXT_TARGET_DATA_INCLINATION_ANGLE_INPUT_DEGREE: TEXT_TARGET_DATA_LATITUDE_INPUT { idc=140040; - w=0.045; - x=0.550*safezoneW+safezoneX+0.350; - y=0.265*safezoneH+safezoneY+0.440; + w="0.045"; + x="0.550*safezoneW+safezoneX+0.350"; + y="0.265*safezoneH+safezoneY+0.440"; onKeyUp=QUOTE(if (_this select 1 == 28) then {1 call FUNC(update_inclination_angle)}); }; class TEXT_TARGET_DATA_TARGET_SPEED: TEXT_TARGET_DATA_LATITUDE { idc=14005; - y=0.265*safezoneH+safezoneY+0.480; + y="0.265*safezoneH+safezoneY+0.480"; text="Target Speed (m/s)"; }; class TEXT_TARGET_DATA_TARGET_SPEED_INPUT: TEXT_TARGET_DATA_LATITUDE_INPUT { idc=140050; - y=0.265*safezoneH+safezoneY+0.480; + y="0.265*safezoneH+safezoneY+0.480"; }; class TEXT_TARGET_DATA_TARGET_SPEED_DIRECTION: ATragMX_RscButton { idc=140051; colorBackground[]={0.15,0.21,0.23,0.3}; colorFocused[]={0.15,0.21,0.23,0.2}; - w=0.0231; - x=0.550*safezoneW+safezoneX+0.305; - y=0.265*safezoneH+safezoneY+0.480; + w="0.0231"; + x="0.550*safezoneW+safezoneX+0.305"; + y="0.265*safezoneH+safezoneY+0.480"; text=">"; action=QUOTE(call FUNC(cycle_target_speed_direction)); }; class TEXT_TARGET_DATA_TARGET_RANGE: TEXT_TARGET_DATA_LATITUDE { idc=14006; - y=0.265*safezoneH+safezoneY+0.520; + y="0.265*safezoneH+safezoneY+0.520"; text="Target Range (meters)"; }; class TEXT_TARGET_DATA_TARGET_RANGE_INPUT: TEXT_TARGET_DATA_LATITUDE_INPUT { idc=140060; - y=0.265*safezoneH+safezoneY+0.520; + y="0.265*safezoneH+safezoneY+0.520"; }; class TEXT_TARGET_DATA_TARGET_RANGE_METER_INDICATOR: TEXT_TARGET_DATA_LATITUDE { idc=140061; - w=0.05; - x=0.550*safezoneW+safezoneX+0.315; - y=0.265*safezoneH+safezoneY+0.520; + w="0.05"; + x="0.550*safezoneW+safezoneX+0.315"; + y="0.265*safezoneH+safezoneY+0.520"; text=""; }; class TEXT_TARGET_DATA_DONE: TEXT_TARGET_SPEED_ASSIST_DONE { @@ -1415,176 +1415,176 @@ class ATragMX_Display { class TEXT_SOLUTION_SETUP_SHOW_RESULT_IN: TEXT_GUN_AMMO_DATA_BORE_HEIGHT { idc=15000; style=64; - w=0.25; - h=0.07; - x=0.550*safezoneW+safezoneX+0.13; - y=0.265*safezoneH+safezoneY+0.32; + w="0.25"; + h="0.07"; + x="0.550*safezoneW+safezoneX+0.13"; + y="0.265*safezoneH+safezoneY+0.32"; text="Show result in"; }; class TEXT_SOLUTION_SETUP_SHOW_RESULT_IN_1: TEXT_TARGET_A { idc=15001; - w=0.04; - x=0.550*safezoneW+safezoneX+0.14; - y=0.265*safezoneH+safezoneY+0.35; + w="0.04"; + x="0.550*safezoneW+safezoneX+0.14"; + y="0.265*safezoneH+safezoneY+0.35"; text="1"; action=QUOTE(GVAR(currentScopeClickNumberTemp) = 1; call FUNC(update_solution_setup)); }; class TEXT_SOLUTION_SETUP_SHOW_RESULT_IN_2: TEXT_SOLUTION_SETUP_SHOW_RESULT_IN_1 { idc=15002; - x=0.550*safezoneW+safezoneX+0.18; + x="0.550*safezoneW+safezoneX+0.18"; text="2"; action=QUOTE(GVAR(currentScopeClickNumberTemp) = 2; call FUNC(update_solution_setup)); }; class TEXT_SOLUTION_SETUP_SHOW_RESULT_IN_3: TEXT_SOLUTION_SETUP_SHOW_RESULT_IN_1 { idc=15003; - x=0.550*safezoneW+safezoneX+0.22; + x="0.550*safezoneW+safezoneX+0.22"; text="3"; action=QUOTE(GVAR(currentScopeClickNumberTemp) = 3; call FUNC(update_solution_setup)); }; class TEXT_SOLUTION_SETUP_SHOW_RESULT_IN_4: TEXT_SOLUTION_SETUP_SHOW_RESULT_IN_1 { idc=15004; - x=0.550*safezoneW+safezoneX+0.26; + x="0.550*safezoneW+safezoneX+0.26"; text="4"; action=QUOTE(GVAR(currentScopeClickNumberTemp) = 4; call FUNC(update_solution_setup)); }; class TEXT_SOLUTION_SETUP_SHOW_RESULT_IN_8: TEXT_SOLUTION_SETUP_SHOW_RESULT_IN_1 { idc=15005; - x=0.550*safezoneW+safezoneX+0.30; + x="0.550*safezoneW+safezoneX+0.30"; text="8"; action=QUOTE(GVAR(currentScopeClickNumberTemp) = 8; call FUNC(update_solution_setup)); }; class TEXT_SOLUTION_SETUP_SHOW_RESULT_IN_10: TEXT_SOLUTION_SETUP_SHOW_RESULT_IN_1 { idc=15006; - x=0.550*safezoneW+safezoneX+0.34; + x="0.550*safezoneW+safezoneX+0.34"; text="10"; action=QUOTE(GVAR(currentScopeClickNumberTemp) = 10; call FUNC(update_solution_setup)); }; class TEXT_SOLUTION_SETUP_CLICKS_PER: TEXT_GUN_AMMO_DATA_BORE_HEIGHT { idc=15007; style=64; - w=0.25; - h=0.07; - x=0.550*safezoneW+safezoneX+0.13; - y=0.265*safezoneH+safezoneY+0.42; + w="0.25"; + h="0.07"; + x="0.550*safezoneW+safezoneX+0.13"; + y="0.265*safezoneH+safezoneY+0.42"; text="Clicks per"; }; class TEXT_SOLUTION_SETUP_CLICKS_PER_TMOA: TEXT_TARGET_A { idc=15008; - w=0.05; - x=0.550*safezoneW+safezoneX+0.15; - y=0.265*safezoneH+safezoneY+0.45; + w="0.05"; + x="0.550*safezoneW+safezoneX+0.15"; + y="0.265*safezoneH+safezoneY+0.45"; text="TMOA"; action=QUOTE(GVAR(currentScopeClickUnitTemp) = 0; call FUNC(update_solution_setup)); }; class TEXT_SOLUTION_SETUP_CLICKS_PER_SMOA: TEXT_SOLUTION_SETUP_CLICKS_PER_TMOA { idc=15009; - x=0.550*safezoneW+safezoneX+0.23; + x="0.550*safezoneW+safezoneX+0.23"; text="SMOA"; action=QUOTE(GVAR(currentScopeClickUnitTemp) = 1; call FUNC(update_solution_setup)); }; class TEXT_SOLUTION_SETUP_CLICKS_PER_MILS: TEXT_SOLUTION_SETUP_CLICKS_PER_TMOA { idc=15010; - x=0.550*safezoneW+safezoneX+0.31; + x="0.550*safezoneW+safezoneX+0.31"; text="MILS"; action=QUOTE(GVAR(currentScopeClickUnitTemp) = 2; call FUNC(update_solution_setup)); }; class TEXT_SOLUTION_SETUP_DONE: TEXT_TARGET_SPEED_ASSIST_DONE { idc=15011; - x=0.550*safezoneW+safezoneX+0.18; - y=0.265*safezoneH+safezoneY+0.55; + x="0.550*safezoneW+safezoneX+0.18"; + y="0.265*safezoneH+safezoneY+0.55"; action=QUOTE(1 call FUNC(toggle_solution_setup)); }; class TEXT_SOLUTION_SETUP_CANCEL: TEXT_TARGET_SPEED_ASSIST_CANCEL { idc=15012; - x=0.550*safezoneW+safezoneX+0.26; - y=0.265*safezoneH+safezoneY+0.55; + x="0.550*safezoneW+safezoneX+0.26"; + y="0.265*safezoneH+safezoneY+0.55"; action=QUOTE(0 call FUNC(toggle_solution_setup)); }; class TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE: TEXT_BORE_HEIGHT { idc=16000; - w=0.22; - y=0.265*safezoneH+safezoneY+0.25; - sizeEx=0.022; + w="0.22"; + y="0.265*safezoneH+safezoneY+0.25"; + sizeEx="0.022"; text="Temperature"; }; class TEXT_MUZZLE_VELOCITY_DATA_MUZZLE_VELOCITY: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE { idc=16001; - x=0.550*safezoneW+safezoneX+0.215; - sizeEx=0.022; + x="0.550*safezoneW+safezoneX+0.215"; + sizeEx="0.022"; text="Muzzle velocity"; }; class TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_1: ATragMX_RscEdit { idc=160021; - w=0.082; - h=0.035; - x=0.550*safezoneW+safezoneX+0.128; - y=0.265*safezoneH+safezoneY+0.29; + w="0.082"; + h="0.035"; + x="0.550*safezoneW+safezoneX+0.128"; + y="0.265*safezoneH+safezoneY+0.29"; text="0"; }; class TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_2: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_1 { idc=160022; - y=0.265*safezoneH+safezoneY+0.325; + y="0.265*safezoneH+safezoneY+0.325"; }; class TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_3: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_1 { idc=160023; - y=0.265*safezoneH+safezoneY+0.360; + y="0.265*safezoneH+safezoneY+0.360"; }; class TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_4: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_1 { idc=160024; - y=0.265*safezoneH+safezoneY+0.395; + y="0.265*safezoneH+safezoneY+0.395"; }; class TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_5: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_1 { idc=160025; - y=0.265*safezoneH+safezoneY+0.430; + y="0.265*safezoneH+safezoneY+0.430"; }; class TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_6: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_1 { idc=160026; - y=0.265*safezoneH+safezoneY+0.465; + y="0.265*safezoneH+safezoneY+0.465"; }; class TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_7: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_1 { idc=160027; - y=0.265*safezoneH+safezoneY+0.500; + y="0.265*safezoneH+safezoneY+0.500"; }; class TEXT_MUZZLE_VELOCITY_DATA_MUZZLE_VELOCITY_INPUT_1: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_1 { idc=160031; - x=0.550*safezoneW+safezoneX+0.225; + x="0.550*safezoneW+safezoneX+0.225"; }; class TEXT_MUZZLE_VELOCITY_DATA_MUZZLE_VELOCITY_INPUT_2: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_2 { idc=160032; - x=0.550*safezoneW+safezoneX+0.225; + x="0.550*safezoneW+safezoneX+0.225"; }; class TEXT_MUZZLE_VELOCITY_DATA_MUZZLE_VELOCITY_INPUT_3: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_3 { idc=160033; - x=0.550*safezoneW+safezoneX+0.225; + x="0.550*safezoneW+safezoneX+0.225"; }; class TEXT_MUZZLE_VELOCITY_DATA_MUZZLE_VELOCITY_INPUT_4: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_4 { idc=160034; - x=0.550*safezoneW+safezoneX+0.225; + x="0.550*safezoneW+safezoneX+0.225"; }; class TEXT_MUZZLE_VELOCITY_DATA_MUZZLE_VELOCITY_INPUT_5: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_5 { idc=160035; - x=0.550*safezoneW+safezoneX+0.225; + x="0.550*safezoneW+safezoneX+0.225"; }; class TEXT_MUZZLE_VELOCITY_DATA_MUZZLE_VELOCITY_INPUT_6: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_6 { idc=160036; - x=0.550*safezoneW+safezoneX+0.225; + x="0.550*safezoneW+safezoneX+0.225"; }; class TEXT_MUZZLE_VELOCITY_DATA_MUZZLE_VELOCITY_INPUT_7: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_7 { idc=160037; - x=0.550*safezoneW+safezoneX+0.225; + x="0.550*safezoneW+safezoneX+0.225"; }; class TEXT_MUZZLE_VELOCITY_DATA_CLEAR: TEXT_TARGET_DATA_NEXT { idc=16004; style=ST_CENTER; - h=0.035; - y=0.265*safezoneH+safezoneY+0.3625; + h="0.035"; + y="0.265*safezoneH+safezoneY+0.3625"; text="Clear"; action=QUOTE(call FUNC(clear_muzzle_velocity_data)); }; class TEXT_MUZZLE_VELOCITY_DATA_QUESTIONMARK: TEXT_MUZZLE_VELOCITY_DATA_CLEAR { idc=16005; - y=0.265*safezoneH+safezoneY+0.430; + y="0.265*safezoneH+safezoneY+0.430"; text="?"; action=""; }; @@ -1605,91 +1605,91 @@ class ATragMX_Display { class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE: TEXT_BORE_HEIGHT { idc=17000; - w=0.22; - x=0.550*safezoneW+safezoneX+0.15; - y=0.265*safezoneH+safezoneY+0.25; - sizeEx=0.022; + w="0.22"; + x="0.550*safezoneW+safezoneX+0.15"; + y="0.265*safezoneH+safezoneY+0.25"; + sizeEx="0.022"; text="Meters"; }; class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_C1_BALLISTIC_COEFFICIENT: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE { idc=17001; - x=0.550*safezoneW+safezoneX+0.235; - sizeEx=0.022; + x="0.550*safezoneW+safezoneX+0.235"; + sizeEx="0.022"; text="BC-Coef"; }; class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_1: ATragMX_RscEdit { idc=170021; - w=0.082; - h=0.035; - x=0.550*safezoneW+safezoneX+0.128; - y=0.265*safezoneH+safezoneY+0.29; + w="0.082"; + h="0.035"; + x="0.550*safezoneW+safezoneX+0.128"; + y="0.265*safezoneH+safezoneY+0.29"; text="0"; }; class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_2: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_1 { idc=170022; - y=0.265*safezoneH+safezoneY+0.325; + y="0.265*safezoneH+safezoneY+0.325"; }; class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_3: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_1 { idc=170023; - y=0.265*safezoneH+safezoneY+0.360; + y="0.265*safezoneH+safezoneY+0.360"; }; class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_4: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_1 { idc=170024; - y=0.265*safezoneH+safezoneY+0.395; + y="0.265*safezoneH+safezoneY+0.395"; }; class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_5: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_1 { idc=170025; - y=0.265*safezoneH+safezoneY+0.430; + y="0.265*safezoneH+safezoneY+0.430"; }; class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_6: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_1 { idc=170026; - y=0.265*safezoneH+safezoneY+0.465; + y="0.265*safezoneH+safezoneY+0.465"; }; class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_7: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_1 { idc=170027; - y=0.265*safezoneH+safezoneY+0.500; + y="0.265*safezoneH+safezoneY+0.500"; }; class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_C1_BALLISTIC_COEFFICIENT_INPUT_1: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_1 { idc=170031; - x=0.550*safezoneW+safezoneX+0.225; + x="0.550*safezoneW+safezoneX+0.225"; }; class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_C1_BALLISTIC_COEFFICIENT_INPUT_2: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_2 { idc=170032; - x=0.550*safezoneW+safezoneX+0.225; + x="0.550*safezoneW+safezoneX+0.225"; }; class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_C1_BALLISTIC_COEFFICIENT_INPUT_3: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_3 { idc=170033; - x=0.550*safezoneW+safezoneX+0.225; + x="0.550*safezoneW+safezoneX+0.225"; }; class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_C1_BALLISTIC_COEFFICIENT_INPUT_4: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_4 { idc=170034; - x=0.550*safezoneW+safezoneX+0.225; + x="0.550*safezoneW+safezoneX+0.225"; }; class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_C1_BALLISTIC_COEFFICIENT_INPUT_5: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_5 { idc=170035; - x=0.550*safezoneW+safezoneX+0.225; + x="0.550*safezoneW+safezoneX+0.225"; }; class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_C1_BALLISTIC_COEFFICIENT_INPUT_6: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_6 { idc=170036; - x=0.550*safezoneW+safezoneX+0.225; + x="0.550*safezoneW+safezoneX+0.225"; }; class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_C1_BALLISTIC_COEFFICIENT_INPUT_7: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_7 { idc=170037; - x=0.550*safezoneW+safezoneX+0.225; + x="0.550*safezoneW+safezoneX+0.225"; }; class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_QUESTIONMARK: TEXT_TARGET_DATA_NEXT { idc=17004; style=ST_CENTER; - w=0.04; - h=0.035; - y=0.265*safezoneH+safezoneY+0.35; + w="0.04"; + h="0.035"; + y="0.265*safezoneH+safezoneY+0.35"; text="?"; action=""; }; class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_CLEAR: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_QUESTIONMARK { idc=17005; - w=0.07; - y=0.265*safezoneH+safezoneY+0.4175; + w="0.07"; + y="0.265*safezoneH+safezoneY+0.4175"; text="Clear"; action=QUOTE(call FUNC(clear_c1_ballistic_coefficient_data)); }; @@ -1711,130 +1711,130 @@ class ATragMX_Display { class TEXT_TRUING_DROP_ZERO_RANGE: ATragMX_RscText { idc=18000; style=ST_LEFT; - x=0.550*safezoneW+safezoneX+0.115; - y=0.265*safezoneH+safezoneY+0.220; - w=0.135; - h=0.03; - sizeEx=0.025; + x="0.550*safezoneW+safezoneX+0.115"; + y="0.265*safezoneH+safezoneY+0.220"; + w="0.135"; + h="0.03"; + sizeEx="0.025"; text="ZR=100meters"; }; class TEXT_TRUING_DROP_DROP_UNIT: TEXT_TRUING_DROP_ZERO_RANGE { idc=18001; style=ST_LEFT; - x=0.550*safezoneW+safezoneX+0.25; + x="0.550*safezoneW+safezoneX+0.25"; text="Drop=mil"; }; class TEXT_TRUING_DROP_TARGET_RANGE: TEXT_TRUING_DROP_ZERO_RANGE { idc=18002; - y=0.265*safezoneH+safezoneY+0.35; - sizeEx=0.027; + y="0.265*safezoneH+safezoneY+0.35"; + sizeEx="0.027"; text="Target Range"; }; class TEXT_TRUING_DROP_DROP: TEXT_TRUING_DROP_TARGET_RANGE { idc=18003; - w=0.07; - y=0.265*safezoneH+safezoneY+0.40; + w="0.07"; + y="0.265*safezoneH+safezoneY+0.40"; text="Drop"; }; class TEXT_TRUING_DROP_MUZZLE_VELOCITY: TEXT_TRUING_DROP_DROP { idc=18004; - y=0.265*safezoneH+safezoneY+0.50; + y="0.265*safezoneH+safezoneY+0.50"; text="MV"; }; class TEXT_TRUING_DROP_C1_BALLISTIC_COEFFICIENT: TEXT_TRUING_DROP_DROP { idc=18005; - y=0.265*safezoneH+safezoneY+0.55; + y="0.265*safezoneH+safezoneY+0.55"; text="C1"; }; class TEXT_TRUING_DROP_DROP_OUTPUT: ATragMX_RscEdit { idc=18006; - style=ST_WITH_RECT+ST_RIGHT; + style=QUOTE(ST_WITH_RECT+ST_RIGHT); colorBackground[]={0.15,0.21,0.23,0.3}; colorDisabled[]={0,0,0,1}; - w=0.06; - y=0.265*safezoneH+safezoneY+0.40; - x=0.550*safezoneW+safezoneX+0.17; + w="0.06"; + y="0.265*safezoneH+safezoneY+0.40"; + x="0.550*safezoneW+safezoneX+0.17"; text=""; }; class TEXT_TRUING_DROP_MUZZLE_VELOCITY_OUTPUT: TEXT_TRUING_DROP_DROP_OUTPUT { idc=18007; - y=0.265*safezoneH+safezoneY+0.50; + y="0.265*safezoneH+safezoneY+0.50"; text=""; }; class TEXT_TRUING_DROP_C1_BALLISTIC_COEFFICIENT_OUTPUT: TEXT_TRUING_DROP_DROP_OUTPUT { idc=18008; - y=0.265*safezoneH+safezoneY+0.55; + y="0.265*safezoneH+safezoneY+0.55"; text=""; }; class TEXT_TRUING_DROP_SUPER: TEXT_TARGET_A { idc=18009; - w=0.06; - x=0.550*safezoneW+safezoneX+0.25; - y=0.265*safezoneH+safezoneY+0.30; + w="0.06"; + x="0.550*safezoneW+safezoneX+0.25"; + y="0.265*safezoneH+safezoneY+0.30"; text="SUPER"; action=QUOTE(GVAR(truingDropMode) = 0; call FUNC(update_truing_drop_selection)); }; class TEXT_TRUING_DROP_SUB: TEXT_TRUING_DROP_SUPER { idc=18010; - x=0.550*safezoneW+safezoneX+0.32; + x="0.550*safezoneW+safezoneX+0.32"; text="SUB"; action=QUOTE(GVAR(truingDropMode) = 1; call FUNC(update_truing_drop_selection)); }; class TEXT_TRUING_DROP_TARGET_RANGE_SUPER_INPUT: ATragMX_RscEdit { idc=18011; - style=ST_WITH_RECT+ST_RIGHT; + style=QUOTE(ST_WITH_RECT+ST_RIGHT); colorDisabled[]={0,0,0,0.6}; - w=0.06; - x=0.550*safezoneW+safezoneX+0.25; - y=0.265*safezoneH+safezoneY+0.35; + w="0.06"; + x="0.550*safezoneW+safezoneX+0.25"; + y="0.265*safezoneH+safezoneY+0.35"; }; class TEXT_TRUING_DROP_TARGET_RANGE_SUB_INPUT: TEXT_TRUING_DROP_TARGET_RANGE_SUPER_INPUT { idc=18012; - x=0.550*safezoneW+safezoneX+0.32; + x="0.550*safezoneW+safezoneX+0.32"; }; class TEXT_TRUING_DROP_DROP_SUPER_INPUT: TEXT_TRUING_DROP_TARGET_RANGE_SUPER_INPUT { idc=18013; - y=0.265*safezoneH+safezoneY+0.40; + y="0.265*safezoneH+safezoneY+0.40"; }; class TEXT_TRUING_DROP_DROP_SUB_INPUT: TEXT_TRUING_DROP_TARGET_RANGE_SUB_INPUT { idc=18014; - y=0.265*safezoneH+safezoneY+0.40; + y="0.265*safezoneH+safezoneY+0.40"; }; class TEXT_TRUING_DROP_CALC: TEXT_GUN_LIST { idc=18015; style=ST_CENTER; - w=0.11; - x=0.550*safezoneW+safezoneX+0.26; - y=0.265*safezoneH+safezoneY+0.45; + w="0.11"; + x="0.550*safezoneW+safezoneX+0.26"; + y="0.265*safezoneH+safezoneY+0.45"; text="Calc"; action=QUOTE(true call FUNC(calculate_truing_drop)); }; class TEXT_TRUING_DROP_MV_INPUT: TEXT_TRUING_DROP_TARGET_RANGE_SUPER_INPUT { idc=18016; - y=0.265*safezoneH+safezoneY+0.50; + y="0.265*safezoneH+safezoneY+0.50"; }; class TEXT_TRUING_DROP_C1_BALLISTIC_COEFFICIENT_INPUT: TEXT_TRUING_DROP_TARGET_RANGE_SUB_INPUT { idc=18017; - y=0.265*safezoneH+safezoneY+0.55; + y="0.265*safezoneH+safezoneY+0.55"; }; class TEXT_TRUING_DROP_ACCEPT: TEXT_GUN_LIST { idc=18018; - w=0.085; - h=0.04; - x=0.550*safezoneW+safezoneX+0.125; - y=0.265*safezoneH+safezoneY+0.60; + w="0.085"; + h="0.04"; + x="0.550*safezoneW+safezoneX+0.125"; + y="0.265*safezoneH+safezoneY+0.60"; text="Accept"; action=QUOTE(1 call FUNC(toggle_truing_drop)); }; class TEXT_TRUING_DROP_CANCEL: TEXT_TRUING_DROP_ACCEPT { idc=18019; - x=0.550*safezoneW+safezoneX+0.210; + x="0.550*safezoneW+safezoneX+0.210"; text="Cancel"; action=QUOTE(0 call FUNC(toggle_truing_drop)); }; class TEXT_TRUING_DROP_RESTORE: TEXT_TRUING_DROP_CANCEL { idc=18020; - x=0.550*safezoneW+safezoneX+0.29525; + x="0.550*safezoneW+safezoneX+0.29525"; text="Restore"; action=QUOTE(true call FUNC(restore_truing_drop)); }; diff --git a/addons/cargo/menu.hpp b/addons/cargo/menu.hpp index a945f6e94c..d86c49e6f5 100644 --- a/addons/cargo/menu.hpp +++ b/addons/cargo/menu.hpp @@ -32,7 +32,7 @@ class GVAR(menu) { y = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)"; w = "13 * (((safezoneW / safezoneH) min 1.2) / 40)"; h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; - style = ST_LEFT + ST_SHADOW; + style = QUOTE(ST_LEFT + ST_SHADOW); font = "RobotoCondensed"; SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; colorText[] = {0.95, 0.95, 0.95, 0.75}; diff --git a/addons/cargo/renameMenu.hpp b/addons/cargo/renameMenu.hpp index af54026e70..a1d0885f9e 100644 --- a/addons/cargo/renameMenu.hpp +++ b/addons/cargo/renameMenu.hpp @@ -32,7 +32,7 @@ class GVAR(renameMenu) { y = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)"; w = "13 * (((safezoneW / safezoneH) min 1.2) / 40)"; h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; - style = ST_LEFT + ST_SHADOW; + style = QUOTE(ST_LEFT + ST_SHADOW); font = "RobotoCondensed"; SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; colorText[] = {0.95, 0.95, 0.95, 0.75}; diff --git a/addons/common/CfgSounds.hpp b/addons/common/CfgSounds.hpp index d564f6717d..5681d1a194 100644 --- a/addons/common/CfgSounds.hpp +++ b/addons/common/CfgSounds.hpp @@ -1,7 +1,7 @@ class CfgSounds { class ACE_Sound_Click { - sound[] = {PATHTOF(sounds\ACE_click.wav), 1, 1, 200}; + sound[] = {QPATHTOF(sounds\ACE_click.wav), 1, 1, 200}; titles[] = {}; }; }; diff --git a/addons/common/CfgUIGrids.hpp b/addons/common/CfgUIGrids.hpp index 295a9098eb..ca653c85b4 100644 --- a/addons/common/CfgUIGrids.hpp +++ b/addons/common/CfgUIGrids.hpp @@ -3,7 +3,15 @@ class CfgUIGrids { class Presets { class Arma3 { class Variables { - grid_ACE_displayText[] = {{((safezoneX + safezoneW) - (10 *(((safezoneW / safezoneH) min 1.2) / 40)) - 2.9 *(((safezoneW / safezoneH) min 1.2) / 40)),safeZoneY + 0.175 * safezoneH, (10 *(((safezoneW / safezoneH) min 1.2) / 40)), (3 *((((safezoneW / safezoneH) min 1.2) / 1.2) / 25))}, "(((safezoneW / safezoneH) min 1.2) / 40)","((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"}; + grid_ACE_displayText[] = { + { + "((safezoneX + safezoneW) - (10 *(((safezoneW / safezoneH) min 1.2) / 40)) - 2.9 *(((safezoneW / safezoneH) min 1.2) / 40))", + "safeZoneY + 0.175 * safezoneH, (10 *(((safezoneW / safezoneH) min 1.2) / 40))", + "(3 *((((safezoneW / safezoneH) min 1.2) / 1.2) / 25))" + }, + "(((safezoneW / safezoneH) min 1.2) / 40)", + "((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)" + }; }; }; }; diff --git a/addons/common/CompassControl.hpp b/addons/common/CompassControl.hpp index 899c609161..971a4a2f99 100644 --- a/addons/common/CompassControl.hpp +++ b/addons/common/CompassControl.hpp @@ -37,25 +37,25 @@ class GVAR(CompassControl): RscControlsGroupNoScrollbars { _display displayAddEventHandler [ARR_2('MouseMoving',_fnc_update)];\ _display displayAddEventHandler [ARR_2('MouseHolding',_fnc_update)];\ ); - x = LEFT; - y = TOP; - w = WIDTH; - h = HEIGHT; + x = QUOTE(LEFT); + y = QUOTE(TOP); + w = QUOTE(WIDTH); + h = QUOTE(HEIGHT); class controls { class Background: RscText { colorBackground[] = BACKGROUND_COLOR; x = 0; y = 0; - w = WIDTH; - h = HEIGHT; + w = QUOTE(WIDTH); + h = QUOTE(HEIGHT); }; class Pointer: RscText { colorBackground[] = POINTER_COLOR; - x = WIDTH/2 - WIDTH*POINTER_WIDTH_FACTOR/2; + x = QUOTE(WIDTH/2 - WIDTH*POINTER_WIDTH_FACTOR/2); y = 0; - w = WIDTH*POINTER_WIDTH_FACTOR; - h = HEIGHT; + w = QUOTE(WIDTH*POINTER_WIDTH_FACTOR); + h = QUOTE(HEIGHT); }; class CompassGroup: RscControlsGroupNoScrollbars { onLoad = QUOTE(\ @@ -65,44 +65,44 @@ class GVAR(CompassControl): RscControlsGroupNoScrollbars { ); x = 0; y = 0; - w = 2*WIDTH; - h = 2*HEIGHT; + w = QUOTE(2*WIDTH); + h = QUOTE(2*HEIGHT); class controls { class Compass0: RscPicture { text = TEXTURE_0; - x = 0 * (WIDTH / 4); + x = QUOTE(0 * (WIDTH / 4)); y = 0; - w = WIDTH/4; - h = HEIGHT; + w = QUOTE(WIDTH/4); + h = QUOTE(HEIGHT); }; class Compass1: Compass0 { text = TEXTURE_1; - x = 1 * (WIDTH / 4); + x = QUOTE(1 * (WIDTH / 4)); }; class Compass2: Compass0 { text = TEXTURE_2; - x = 2 * (WIDTH / 4); + x = QUOTE(2 * (WIDTH / 4)); }; class Compass3: Compass0 { text = TEXTURE_3; - x = 3 * (WIDTH / 4); + x = QUOTE(3 * (WIDTH / 4)); }; class Compass4: Compass0 { text = TEXTURE_0; - x = 4 * (WIDTH / 4); + x = QUOTE(4 * (WIDTH / 4)); }; class Compass5: Compass0 { text = TEXTURE_1; - x = 5 * (WIDTH / 4); + x = QUOTE(5 * (WIDTH / 4)); }; class Compass6: Compass0 { text = TEXTURE_2; - x = 6 * (WIDTH / 4); + x = QUOTE(6 * (WIDTH / 4)); }; class Compass7: Compass0 { text = TEXTURE_3; - x = 7 * (WIDTH / 4); + x = QUOTE(7 * (WIDTH / 4)); }; }; }; diff --git a/addons/common/HintConfig.hpp b/addons/common/HintConfig.hpp index f647b7b1de..72fd7f6233 100644 --- a/addons/common/HintConfig.hpp +++ b/addons/common/HintConfig.hpp @@ -37,10 +37,10 @@ class RscTitles { SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; colorText[] = {1, 1, 1, 1}; colorBackground[] = {0, 0, 0, 0.5}; - x = safeZoneW + safeZoneX - 0 * safezoneW; //safeZoneW + safeZoneX - 0.2 * safezoneW; - y = safeZoneY + 0.2 * safezoneH; - w = 0.2 * safeZoneW; - h = 0.1 * SafeZoneH; + x = "safeZoneW + safeZoneX - 0 * safezoneW"; //safeZoneW + safeZoneX - 0.2 * safezoneW; + y = "safeZoneY + 0.2 * safezoneH"; + w = "0.2 * safeZoneW"; + h = "0.1 * SafeZoneH"; font = "RobotoCondensed"; }; }; @@ -61,10 +61,10 @@ class RscTitles { SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; colorText[] = {1, 1, 1, 1}; colorBackground[] = {0.8, 0, 0, 0.5}; - x = 0.3 * safeZoneW + safeZoneX; - y = 0.4 * safezoneH + safeZoneY; - w = 0.4 * safeZoneW; - h = 0.2 * SafeZoneH; + x = "0.3 * safeZoneW + safeZoneX"; + y = "0.4 * safezoneH + safeZoneY"; + w = "0.4 * safeZoneW"; + h = "0.2 * SafeZoneH"; }; }; }; diff --git a/addons/dogtags/CfgUIGrids.hpp b/addons/dogtags/CfgUIGrids.hpp index f9216ac2ea..78944ccaad 100644 --- a/addons/dogtags/CfgUIGrids.hpp +++ b/addons/dogtags/CfgUIGrids.hpp @@ -5,13 +5,13 @@ class CfgUIGrids { class Variables { GVAR(grid)[] = { { - (safeZoneX + safeZoneW) - 12.9 * GUI_GRID_W, - safeZoneY + 0.175 * safeZoneH, - 8 * GUI_GRID_W, - 8 * GUI_GRID_H + QUOTE((safeZoneX + safeZoneW) - 12.9 * GUI_GRID_W), + QUOTE(safeZoneY + 0.175 * safeZoneH), + QUOTE(8 * GUI_GRID_W), + QUOTE(8 * GUI_GRID_H) }, - GUI_GRID_W, - GUI_GRID_H + QUOTE(GUI_GRID_W), + QUOTE(GUI_GRID_H) }; }; }; diff --git a/addons/dogtags/RscTitles.hpp b/addons/dogtags/RscTitles.hpp index 97549c856e..5bcd318205 100644 --- a/addons/dogtags/RscTitles.hpp +++ b/addons/dogtags/RscTitles.hpp @@ -13,23 +13,23 @@ class RscTitles { class controls { class background: RscPicture { idc = 1000; - x = profileNamespace getVariable ['TRIPLES(IGUI,GVAR(grid),X)', (safeZoneX + safeZoneW) - 12.9 * GUI_GRID_W]; - y = profileNamespace getVariable ['TRIPLES(IGUI,GVAR(grid),Y)', safeZoneY + 0.175 * safeZoneH]; - w = 8 * GUI_GRID_W; - h = 8 * GUI_GRID_H; + x = QUOTE(profileNamespace getVariable [ARR_2('TRIPLES(IGUI,GVAR(grid),X)', (safeZoneX + safeZoneW) - 12.9 * GUI_GRID_W)]); + y = QUOTE(profileNamespace getVariable [ARR_2('TRIPLES(IGUI,GVAR(grid),Y)', safeZoneY + 0.175 * safeZoneH)]); + w = QUOTE(8 * GUI_GRID_W); + h = QUOTE(8 * GUI_GRID_H); text = QPATHTOF(data\dogtagSingle.paa); colorText[] = {1, 1, 1, 1}; }; class nickname: RscStructuredText { idc = 1001; text = ""; - sizeEx = GUI_GRID_H; + sizeEx = QUOTE(GUI_GRID_H); colorText[] = {1, 1, 1, 1}; colorBackground[] = {0, 0, 0, 0}; - x = 1.6 * GUI_GRID_W + (profileNamespace getVariable ['TRIPLES(IGUI,GVAR(grid),X)', (safeZoneX + safeZoneW) - 12.9 * GUI_GRID_W]); - y = 0.065 * safeZoneH + (profileNamespace getVariable ['TRIPLES(IGUI,GVAR(grid),Y)', safeZoneY + 0.175 * safeZoneH]); - w = 5.9 * GUI_GRID_W; - h = 3 * GUI_GRID_H; + x = QUOTE(1.6 * GUI_GRID_W + (profileNamespace getVariable [ARR_2('TRIPLES(IGUI,GVAR(grid),X)', (safeZoneX + safeZoneW) - 12.9 * GUI_GRID_W)])); + y = QUOTE(0.065 * safeZoneH + (profileNamespace getVariable [ARR_2('TRIPLES(IGUI,GVAR(grid),Y)', safeZoneY + 0.175 * safeZoneH)])); + w = QUOTE(5.9 * GUI_GRID_W); + h = QUOTE(3 * GUI_GRID_H); font = "RobotoCondensed"; class Attributes { font = "RobotoCondensed"; diff --git a/addons/explosives/ExplosivesUI.hpp b/addons/explosives/ExplosivesUI.hpp index cd06abff5b..75f29afbfe 100644 --- a/addons/explosives/ExplosivesUI.hpp +++ b/addons/explosives/ExplosivesUI.hpp @@ -13,9 +13,9 @@ class Rsc_ACE_CallScreen_Edit: RscEdit { style = "0x00 + 0x40 + 0x200"; shadow = 1; SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 20) * 1)"; - x = 0.288594 * safezoneW + safezoneX; - w = 0.0825 * safezoneW; - h = 0.044 * safezoneH; + x = "0.288594 * safezoneW + safezoneX"; + w = "0.0825 * safezoneW"; + h = "0.044 * safezoneH"; }; class Rsc_ACE_HiddenButton: RscButton { colorText[] = {0, 0, 0, 0}; @@ -40,175 +40,175 @@ class Rsc_ACE_PhoneInterface { class RscPicture_1200: RscPicture { idc = 1200; text = QPATHTOF(Data\UI\Cellphone_Background.paa); - x = 0.231875 * safezoneW + safezoneX; - y = 0.104 * safezoneH + safezoneY; - w = 0.195937 * safezoneW; - h = 0.704 * safezoneH; + x = "0.231875 * safezoneW + safezoneX"; + y = "0.104 * safezoneH + safezoneY"; + w = "0.195937 * safezoneW"; + h = "0.704 * safezoneH"; }; class numkey_1: Rsc_ACE_NumKeyButton { idc = 1600; - x = 0.278281 * safezoneW + safezoneX; - y = 0.533 * safezoneH + safezoneY; - w = 0.0309375 * safezoneW; - h = 0.033 * safezoneH; + x = "0.278281 * safezoneW + safezoneX"; + y = "0.533 * safezoneH + safezoneY"; + w = "0.0309375 * safezoneW"; + h = "0.033 * safezoneH"; tooltip = "1"; action = "ctrlSetText [1400,((ctrlText 1400) + '1')];"; }; class numkey_2: Rsc_ACE_NumKeyButton { idc = 1601; - x = 0.314375 * safezoneW + safezoneX; - y = 0.533 * safezoneH + safezoneY; - w = 0.0309375 * safezoneW; - h = 0.033 * safezoneH; + x = "0.314375 * safezoneW + safezoneX"; + y = "0.533 * safezoneH + safezoneY"; + w = "0.0309375 * safezoneW"; + h = "0.033 * safezoneH"; tooltip = "2"; action = "ctrlSetText [1400,((ctrlText 1400) + '2')];"; }; class numkey_3: Rsc_ACE_NumKeyButton { idc = 1602; - x = 0.350469 * safezoneW + safezoneX; - y = 0.533 * safezoneH + safezoneY; - w = 0.0309375 * safezoneW; - h = 0.033 * safezoneH; + x = "0.350469 * safezoneW + safezoneX"; + y = "0.533 * safezoneH + safezoneY"; + w = "0.0309375 * safezoneW"; + h = "0.033 * safezoneH"; tooltip = "3"; action = "ctrlSetText [1400,((ctrlText 1400) + '3')];"; }; class numkey_4: Rsc_ACE_NumKeyButton { idc = 1603; - x = 0.278281 * safezoneW + safezoneX; - y = 0.577 * safezoneH + safezoneY; - w = 0.0309375 * safezoneW; - h = 0.033 * safezoneH; + x = "0.278281 * safezoneW + safezoneX"; + y = "0.577 * safezoneH + safezoneY"; + w = "0.0309375 * safezoneW"; + h = "0.033 * safezoneH"; tooltip = "4"; action = "ctrlSetText [1400,((ctrlText 1400) + '4')];"; }; class numkey_5: Rsc_ACE_NumKeyButton { idc = 1604; - x = 0.314375 * safezoneW + safezoneX; - y = 0.577 * safezoneH + safezoneY; - w = 0.0309375 * safezoneW; - h = 0.033 * safezoneH; + x = "0.314375 * safezoneW + safezoneX"; + y = "0.577 * safezoneH + safezoneY"; + w = "0.0309375 * safezoneW"; + h = "0.033 * safezoneH"; tooltip = "5"; action = "ctrlSetText [1400,((ctrlText 1400) + '5')];"; }; class numkey_6: Rsc_ACE_NumKeyButton { idc = 1605; - x = 0.350469 * safezoneW + safezoneX; - y = 0.577 * safezoneH + safezoneY; - w = 0.0309375 * safezoneW; - h = 0.033 * safezoneH; + x = "0.350469 * safezoneW + safezoneX"; + y = "0.577 * safezoneH + safezoneY"; + w = "0.0309375 * safezoneW"; + h = "0.033 * safezoneH"; tooltip = "6"; action = "ctrlSetText [1400,((ctrlText 1400) + '6')];"; }; class numkey_7: Rsc_ACE_NumKeyButton { idc = 1606; - x = 0.278281 * safezoneW + safezoneX; - y = 0.621 * safezoneH + safezoneY; - w = 0.0309375 * safezoneW; - h = 0.033 * safezoneH; + x = "0.278281 * safezoneW + safezoneX"; + y = "0.621 * safezoneH + safezoneY"; + w = "0.0309375 * safezoneW"; + h = "0.033 * safezoneH"; tooltip = "7"; action = "ctrlSetText [1400,((ctrlText 1400) + '7')];"; }; class numkey_8: Rsc_ACE_NumKeyButton { idc = 1607; - x = 0.314375 * safezoneW + safezoneX; - y = 0.621 * safezoneH + safezoneY; - w = 0.0309375 * safezoneW; - h = 0.033 * safezoneH; + x = "0.314375 * safezoneW + safezoneX"; + y = "0.621 * safezoneH + safezoneY"; + w = "0.0309375 * safezoneW"; + h = "0.033 * safezoneH"; tooltip = "8"; action = "ctrlSetText [1400,((ctrlText 1400) + '8')];"; }; class numkey_9: Rsc_ACE_NumKeyButton { idc = 1608; - x = 0.350469 * safezoneW + safezoneX; - y = 0.621 * safezoneH + safezoneY; - w = 0.0309375 * safezoneW; - h = 0.033 * safezoneH; + x = "0.350469 * safezoneW + safezoneX"; + y = "0.621 * safezoneH + safezoneY"; + w = "0.0309375 * safezoneW"; + h = "0.033 * safezoneH"; tooltip = "9"; action = "ctrlSetText [1400,((ctrlText 1400) + '9')];"; }; class numkey_0: Rsc_ACE_NumKeyButton { idc = 1609; - x = 0.314375 * safezoneW + safezoneX; - y = 0.676 * safezoneH + safezoneY; - w = 0.0309375 * safezoneW; - h = 0.033 * safezoneH; + x = "0.314375 * safezoneW + safezoneX"; + y = "0.676 * safezoneH + safezoneY"; + w = "0.0309375 * safezoneW"; + h = "0.033 * safezoneH"; tooltip = "0"; action = "ctrlSetText [1400,((ctrlText 1400) + '0')];"; }; class speedDialAdd: Rsc_ACE_NumKeyButton { idc = 1610; - x = 0.278281 * safezoneW + safezoneX; - y = 0.676 * safezoneH + safezoneY; - w = 0.0309375 * safezoneW; - h = 0.033 * safezoneH; + x = "0.278281 * safezoneW + safezoneX"; + y = "0.676 * safezoneH + safezoneY"; + w = "0.0309375 * safezoneW"; + h = "0.033 * safezoneH"; tooltip = CSTRING(Phone_AddToSpeedDial); action = QUOTE([ARR_2(ctrlText 1401,ctrlText 1400)] call FUNC(addToSpeedDial);); }; class clear: Rsc_ACE_HiddenButton { idc = 1610; - x = 0.278281 * safezoneW + safezoneX; - y = 0.445 * safezoneH + safezoneY; - w = 0.020625 * safezoneW; - h = 0.033 * safezoneH; + x = "0.278281 * safezoneW + safezoneX"; + y = "0.445 * safezoneH + safezoneY"; + w = "0.020625 * safezoneW"; + h = "0.033 * safezoneH"; tooltip = CSTRING(Clear); action = QUOTE(ctrlSetText [ARR_2(1400,'')];[ctrlText 1401] call FUNC(removeFromSpeedDial);ctrlSetText [ARR_2(1401,'')];); }; class dial: Rsc_ACE_HiddenButton { idc = 1611; - x = 0.309219 * safezoneW + safezoneX; - y = 0.445 * safezoneH + safezoneY; - w = 0.04125 * safezoneW; - h = 0.033 * safezoneH; + x = "0.309219 * safezoneW + safezoneX"; + y = "0.445 * safezoneH + safezoneY"; + w = "0.04125 * safezoneW"; + h = "0.033 * safezoneH"; tooltip = CSTRING(Phone_Dial); action = QUOTE([ARR_2(ace_player,ctrlText 1400)] call FUNC(dialPhone);); }; class up: Rsc_ACE_HiddenButton { idc = 1612; - x = 0.360781 * safezoneW + safezoneX; - y = 0.445 * safezoneH + safezoneY; - w = 0.020625 * safezoneW; - h = 0.033 * safezoneH; + x = "0.360781 * safezoneW + safezoneX"; + y = "0.445 * safezoneH + safezoneY"; + w = "0.020625 * safezoneW"; + h = "0.033 * safezoneH"; tooltip = CSTRING(Phone_Up); action = QUOTE([true] call FUNC(setSpeedDial)); }; class down: Rsc_ACE_HiddenButton { idc = 1613; - x = 0.345312 * safezoneW + safezoneX; - y = 0.485 * safezoneH + safezoneY; - w = 0.020625 * safezoneW; - h = 0.033 * safezoneH; + x = "0.345312 * safezoneW + safezoneX"; + y = "0.485 * safezoneH + safezoneY"; + w = "0.020625 * safezoneW"; + h = "0.033 * safezoneH"; tooltip = CSTRING(Phone_Down); action = QUOTE([false] call FUNC(setSpeedDial)); }; class speedDial_Text: RscText { idc = 1405; - y = 0.302 * safezoneH + safezoneY; + y = "0.302 * safezoneH + safezoneY"; SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 22) * 1)"; - x = 0.288594 * safezoneW + safezoneX; - w = 0.0825 * safezoneW; - h = 0.044 * safezoneH; + x = "0.288594 * safezoneW + safezoneX"; + w = "0.0825 * safezoneW"; + h = "0.044 * safezoneH"; text = "Name"; }; class speedDial_edit: Rsc_ACE_CallScreen_Edit { idc = 1401; - y = 0.302 * safezoneH + safezoneY; - x = 0.318 * safezoneW + safezoneX; - w = 0.1; + y = "0.302 * safezoneH + safezoneY"; + x = "0.318 * safezoneW + safezoneX"; + w = "0.1"; }; class numberEdit_Text: RscText { idc = 1406; - y = 0.348 * safezoneH + safezoneY; + y = "0.348 * safezoneH + safezoneY"; SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 22) * 1)"; - x = 0.288594 * safezoneW + safezoneX; - w = 0.0825 * safezoneW; - h = 0.044 * safezoneH; + x = "0.288594 * safezoneW + safezoneX"; + w = "0.0825 * safezoneW"; + h = "0.044 * safezoneH"; text = "#"; }; class number_edit: Rsc_ACE_CallScreen_Edit { canModify = 0; idc = 1400; - y = 0.348 * safezoneH + safezoneY; - x = 0.3 * safezoneW + safezoneX; + y = "0.348 * safezoneH + safezoneY"; + x = "0.3 * safezoneW + safezoneX"; }; }; }; diff --git a/addons/explosives/TimerDialog.hpp b/addons/explosives/TimerDialog.hpp index a3ab96af06..50ee0086bc 100644 --- a/addons/explosives/TimerDialog.hpp +++ b/addons/explosives/TimerDialog.hpp @@ -7,19 +7,19 @@ class GVAR(timerUI) { class Header: RscText { idc = -1; text = CSTRING(ExplosiveTimer); - x = 13.5 * GUI_GRID_W + GUI_GRID_CENTER_X; - y = 5 * GUI_GRID_H + GUI_GRID_CENTER_Y; - w = 13 * GUI_GRID_W; - h = GUI_GRID_H; + x = QUOTE(13.5 * GUI_GRID_W + GUI_GRID_CENTER_X); + y = QUOTE(5 * GUI_GRID_H + GUI_GRID_CENTER_Y); + w = QUOTE(13 * GUI_GRID_W); + h = QUOTE(GUI_GRID_H); colorBackground[] = GUI_BCG_COLOR; moving = 1; }; class Background: RscText { idd = -1; - x = 13.5 * GUI_GRID_W + GUI_GRID_CENTER_X; - y = 6.1 * GUI_GRID_H + GUI_GRID_CENTER_Y; - w = 13 * GUI_GRID_W; - h = 6.5 * GUI_GRID_H; + x = QUOTE(13.5 * GUI_GRID_W + GUI_GRID_CENTER_X); + y = QUOTE(6.1 * GUI_GRID_H + GUI_GRID_CENTER_Y); + w = QUOTE(13 * GUI_GRID_W); + h = QUOTE(6.5 * GUI_GRID_H); colorBackground[] = {0, 0, 0, 0.8}; }; }; @@ -27,24 +27,24 @@ class GVAR(timerUI) { class DigitBackground_1: RscPicture { idc = -1; text = QPATHTOF(UI\seven_segment_8.paa); - x = 14 * GUI_GRID_W + GUI_GRID_CENTER_X; - y = 6.6 * GUI_GRID_H + GUI_GRID_CENTER_Y; - w = 4 * GUI_GRID_W; - h = 4 * GUI_GRID_H; + x = QUOTE(14 * GUI_GRID_W + GUI_GRID_CENTER_X); + y = QUOTE(6.6 * GUI_GRID_H + GUI_GRID_CENTER_Y); + w = QUOTE(4 * GUI_GRID_W); + h = QUOTE(4 * GUI_GRID_H); colorText[] = {0.3, 0.3, 0.3, 0.5}; }; class DigitBackground_2: DigitBackground_1 { - x = 16.4 * GUI_GRID_W + GUI_GRID_CENTER_X; + x = QUOTE(16.4 * GUI_GRID_W + GUI_GRID_CENTER_X); }; class DigitBackground_3: DigitBackground_1 { - x = 19.7 * GUI_GRID_W + GUI_GRID_CENTER_X; + x = QUOTE(19.7 * GUI_GRID_W + GUI_GRID_CENTER_X); }; class DigitBackground_4: DigitBackground_1 { - x = 22.1 * GUI_GRID_W + GUI_GRID_CENTER_X; + x = QUOTE(22.1 * GUI_GRID_W + GUI_GRID_CENTER_X); }; class DigitSeparator: DigitBackground_1 { text = QPATHTOF(UI\seven_segment_separator.paa); - x = 18.025 * GUI_GRID_W + GUI_GRID_CENTER_X; + x = QUOTE(18.025 * GUI_GRID_W + GUI_GRID_CENTER_X); colorText[] = {1, 0.05, 0.05, 1}; }; class Digit_1: DigitBackground_1 { @@ -54,22 +54,22 @@ class GVAR(timerUI) { }; class Digit_2: Digit_1 { idc = IDC_TIMER_DIGIT_2; - x = 16.4 * GUI_GRID_W + GUI_GRID_CENTER_X; + x = QUOTE(16.4 * GUI_GRID_W + GUI_GRID_CENTER_X); }; class Digit_3: Digit_1 { idc = IDC_TIMER_DIGIT_3; - x = 19.7 * GUI_GRID_W + GUI_GRID_CENTER_X; + x = QUOTE(19.7 * GUI_GRID_W + GUI_GRID_CENTER_X); }; class Digit_4: Digit_1 { idc = IDC_TIMER_DIGIT_4; - x = 22.1 * GUI_GRID_W + GUI_GRID_CENTER_X; + x = QUOTE(22.1 * GUI_GRID_W + GUI_GRID_CENTER_X); }; class Slider: ctrlXSliderH { idc = IDC_TIMER_SLIDER; - x = 14 * GUI_GRID_W + GUI_GRID_CENTER_X; - y = 11.1 * GUI_GRID_H + GUI_GRID_CENTER_Y; - w = 12 * GUI_GRID_W; - h = GUI_GRID_H; + x = QUOTE(14 * GUI_GRID_W + GUI_GRID_CENTER_X); + y = QUOTE(11.1 * GUI_GRID_H + GUI_GRID_CENTER_Y); + w = QUOTE(12 * GUI_GRID_W); + h = QUOTE(GUI_GRID_H); color[] = {0.3, 0.3, 0.3, 0.7}; colorActive[] = {0.3, 0.3, 0.3, 0.7}; sliderRange[] = {TIMER_VALUE_MIN, TIMER_VALUE_MAX}; @@ -79,10 +79,10 @@ class GVAR(timerUI) { idc = -1; text = CSTRING(Cancel); onButtonClick = QUOTE(closeDialog 0); - x = 13.5 * GUI_GRID_W + GUI_GRID_CENTER_X; - y = 12.7 * GUI_GRID_H + GUI_GRID_CENTER_Y; - w = 5 * GUI_GRID_W; - h = GUI_GRID_H; + x = QUOTE(13.5 * GUI_GRID_W + GUI_GRID_CENTER_X); + y = QUOTE(12.7 * GUI_GRID_H + GUI_GRID_CENTER_Y); + w = QUOTE(5 * GUI_GRID_W); + h = QUOTE(GUI_GRID_H); colorActive[] = {0, 0, 0, 1}; colorBackground[] = {0, 0, 0, 0.8}; colorFocused[] = {0, 0, 0, 0.8}; @@ -91,7 +91,7 @@ class GVAR(timerUI) { idc = IDC_TIMER_CONFIRM; text = CSTRING(SetTime); onButtonClick = ""; - x = 21.5 * GUI_GRID_W + GUI_GRID_CENTER_X; + x = QUOTE(21.5 * GUI_GRID_W + GUI_GRID_CENTER_X); }; }; }; diff --git a/addons/fastroping/CfgVehicles.hpp b/addons/fastroping/CfgVehicles.hpp index d6d40f13be..710f70f94e 100644 --- a/addons/fastroping/CfgVehicles.hpp +++ b/addons/fastroping/CfgVehicles.hpp @@ -83,8 +83,8 @@ class CfgVehicles { }; class ACE_fastRope { displayName = CSTRING(Interaction_fastRope); - condition = [_player, _target] call FUNC(canFastRope); - statement = [_player, _target] call FUNC(fastRope); + condition = QUOTE([ARR_2(_player, _target)] call FUNC(canFastRope)); + statement = QUOTE([ARR_2(_player, _target)] call FUNC(fastRope)); }; }; }; diff --git a/addons/fastroping/script_macros.hpp b/addons/fastroping/script_macros.hpp index 2ea5d961c8..baaa10c338 100644 --- a/addons/fastroping/script_macros.hpp +++ b/addons/fastroping/script_macros.hpp @@ -6,5 +6,5 @@ expression = QUOTE(if (_value) then {[_this] call EFUNC(fastroping,equipFRIES)}); \ typeName = "BOOL"; \ condition = "objectVehicle"; \ - defaultValue = false; \ + defaultValue = "false"; \ } diff --git a/addons/field_rations/CfgMoves.hpp b/addons/field_rations/CfgMoves.hpp index 7fc9ebf3ec..dd0a23b829 100644 --- a/addons/field_rations/CfgMoves.hpp +++ b/addons/field_rations/CfgMoves.hpp @@ -33,19 +33,19 @@ class CfgMovesMaleSdr: CfgMovesBasic { }; class GVAR(drinkStandCan): GVAR(drinkStand) { file = QPATHTOF(anim\drink_stand_can.rtm); - speed = 1/9; + speed = "1/9"; }; class GVAR(drinkCrouchCan): GVAR(drinkCrouch) { file = QPATHTOF(anim\drink_crouch_can.rtm); - speed = 1/9; + speed = "1/9"; }; class GVAR(drinkProneCan): GVAR(drinkProne) { file = QPATHTOF(anim\drink_prone_can.rtm); - speed = 1/9; + speed = "1/9"; }; class GVAR(drinkFromSource): GVAR(drinkStand) { file = QPATHTOF(anim\drink_source.rtm); - speed = 1/8; + speed = "1/8"; }; class GVAR(drinkFromSourceHigh): GVAR(drinkFromSource) { file = QPATHTOF(anim\drink_source_high.rtm); diff --git a/addons/field_rations/CfgUIGrids.hpp b/addons/field_rations/CfgUIGrids.hpp index ce5d3d6440..9c02c00945 100644 --- a/addons/field_rations/CfgUIGrids.hpp +++ b/addons/field_rations/CfgUIGrids.hpp @@ -5,13 +5,13 @@ class CfgUIGrids { class Variables { XGVAR(grid)[] = { { - safeZoneX + safeZoneW - 4.2 * GUI_GRID_W, - safeZoneY + safeZoneH - 2.2 * GUI_GRID_H, - 4 * GUI_GRID_W, - 2 * GUI_GRID_H + QUOTE(safeZoneX + safeZoneW - 4.2 * GUI_GRID_W), + QUOTE(safeZoneY + safeZoneH - 2.2 * GUI_GRID_H), + QUOTE(4 * GUI_GRID_W), + QUOTE(2 * GUI_GRID_H) }, - GUI_GRID_W, - GUI_GRID_H + QUOTE(GUI_GRID_W), + QUOTE(GUI_GRID_H) }; }; }; diff --git a/addons/field_rations/RscTitles.hpp b/addons/field_rations/RscTitles.hpp index 274ceb9f4a..241b5b0e1f 100644 --- a/addons/field_rations/RscTitles.hpp +++ b/addons/field_rations/RscTitles.hpp @@ -12,15 +12,15 @@ class RscTitles { class controls { class Thirst: RscPicture { idc = IDC_COLORED_HUD_THIRST; - x = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W]; - y = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),Y)), safeZoneY + safeZoneH - 2.2 * GUI_GRID_H]; - w = 2 * GUI_GRID_W; - h = 2 * GUI_GRID_H; + x = QUOTE(profileNamespace getVariable [ARR_2(QUOTE(QUOTE(TRIPLES(IGUI,XGVAR(grid),X))), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W)]); + y = QUOTE(profileNamespace getVariable [ARR_2(QUOTE(QUOTE(TRIPLES(IGUI,XGVAR(grid),Y))), safeZoneY + safeZoneH - 2.2 * GUI_GRID_H)]); + w = QUOTE(2 * GUI_GRID_W); + h = QUOTE(2 * GUI_GRID_H); text = QPATHTOF(ui\icon_hud_thirststatus.paa); }; class Hunger: Thirst { idc = IDC_COLORED_HUD_HUNGER; - x = 2 * GUI_GRID_W + (profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W]); + x = QUOTE(2 * GUI_GRID_W + (profileNamespace getVariable [ARR_2(QUOTE(QUOTE(TRIPLES(IGUI,XGVAR(grid),X))), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W)])); text = QPATHTOF(ui\icon_hud_hungerstatus.paa); }; }; @@ -35,39 +35,39 @@ class RscTitles { class controlsBackground { class Thirst: RscPicture { idc = -1; - x = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W]; - y = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),Y)), safeZoneY + safeZoneH - 2.2 * GUI_GRID_H]; - w = 2 * GUI_GRID_W; - h = 2 * GUI_GRID_H; + x = QUOTE(profileNamespace getVariable [ARR_2(QUOTE(QUOTE(TRIPLES(IGUI,XGVAR(grid),X))), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W)]); + y = QUOTE(profileNamespace getVariable [ARR_2(QUOTE(QUOTE(TRIPLES(IGUI,XGVAR(grid),Y))), safeZoneY + safeZoneH - 2.2 * GUI_GRID_H)]); + w = QUOTE(2 * GUI_GRID_W); + h = QUOTE(2 * GUI_GRID_H); text = QPATHTOF(ui\icon_hud_thirststatus.paa); colorText[] = {1, 1, 1, 0.2}; }; class Hunger: Thirst { - x = 2 * GUI_GRID_W + (profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W]); + x = QUOTE(2 * GUI_GRID_W + (profileNamespace getVariable [ARR_2(QUOTE(QUOTE(TRIPLES(IGUI,XGVAR(grid),X))), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W)])); text = QPATHTOF(ui\icon_hud_hungerstatus.paa); }; }; class controls { class ThirstGroup: RscControlsGroupNoScrollbars { idc = IDC_DRAINING_HUD_THIRST_GROUP; - x = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W]; - y = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),Y)), safeZoneY + safeZoneH - 2.2 * GUI_GRID_H]; - w = 2 * GUI_GRID_W; - h = 2 * GUI_GRID_H; + x = QUOTE(profileNamespace getVariable [ARR_2(QUOTE(QUOTE(TRIPLES(IGUI,XGVAR(grid),X))), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W)]); + y = QUOTE(profileNamespace getVariable [ARR_2(QUOTE(QUOTE(TRIPLES(IGUI,XGVAR(grid),Y))), safeZoneY + safeZoneH - 2.2 * GUI_GRID_H)]); + w = QUOTE(2 * GUI_GRID_W); + h = QUOTE(2 * GUI_GRID_H); class controls { class Icon: RscPicture { idc = IDC_DRAINING_HUD_THIRST_ICON; x = 0; y = 0; - w = 2 * GUI_GRID_W; - h = 2 * GUI_GRID_H; + w = QUOTE(2 * GUI_GRID_W); + h = QUOTE(2 * GUI_GRID_H); text = QPATHTOF(ui\icon_hud_thirststatus.paa); }; }; }; class HungerGroup: ThirstGroup { idc = IDC_DRAINING_HUD_HUNGER_GROUP; - x = 2 * GUI_GRID_W + (profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W]); + x = QUOTE(2 * GUI_GRID_W + (profileNamespace getVariable [ARR_2(QUOTE(QUOTE(TRIPLES(IGUI,XGVAR(grid),X))), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W)])); class controls: controls { class Icon: Icon { idc = IDC_DRAINING_HUD_HUNGER_ICON; diff --git a/addons/fire/CfgSounds.hpp b/addons/fire/CfgSounds.hpp index fd4899eaca..0d6bf43ec2 100644 --- a/addons/fire/CfgSounds.hpp +++ b/addons/fire/CfgSounds.hpp @@ -3,7 +3,7 @@ #define CREATE_SCREAM(no)\ class GVAR(DOUBLES(scream,no)) { \ name = QUOTE(GVAR(CONCAT(scream,no)));\ - sound[] = {QUOTE(PATHTOF(CONCAT(sounds\scream,no).ogg)), db + 8, 1};\ + sound[] = {QUOTE(PATHTOF(CONCAT(sounds\scream,no).ogg)), "db + 8", 1};\ titles[] = {}; \ } diff --git a/addons/fire/RscTitles.hpp b/addons/fire/RscTitles.hpp index e50715d94a..02ecd250e4 100644 --- a/addons/fire/RscTitles.hpp +++ b/addons/fire/RscTitles.hpp @@ -22,7 +22,7 @@ class RscTitles { y = "SafeZoneY"; w = "SafeZoneW + 0.05"; h = "SafeZoneH + 0.05"; - text = PATHTOF(data\overlay_burn_1.paa); + text = QPATHTOF(data\overlay_burn_1.paa); }; }; }; @@ -34,7 +34,7 @@ class RscTitles { class controls: controls { class GVAR(indicator): GVAR(indicator) { - text = PATHTOF(data\overlay_burn_2.paa); + text = QPATHTOF(data\overlay_burn_2.paa); }; }; }; diff --git a/addons/frag/CfgAmmo.hpp b/addons/frag/CfgAmmo.hpp index 2c42e805ec..3c555096f2 100644 --- a/addons/frag/CfgAmmo.hpp +++ b/addons/frag/CfgAmmo.hpp @@ -13,7 +13,7 @@ class CfgAmmo { GVAR(metal) = 140000; GVAR(charge) = 87000; GVAR(gurney_c) = 2320; - GVAR(gurney_k) = 1/2; + GVAR(gurney_k) = "1/2"; }; class Bomb_04_F: ammo_Bomb_LaserGuidedBase { GVAR(enabled) = 1; @@ -22,7 +22,7 @@ class CfgAmmo { GVAR(metal) = 140000; GVAR(charge) = 87000; GVAR(gurney_c) = 2320; - GVAR(gurney_k) = 1/2; + GVAR(gurney_k) = "1/2"; }; class BombCore; class Bo_Mk82: BombCore { @@ -32,7 +32,7 @@ class CfgAmmo { GVAR(metal) = 140000; GVAR(charge) = 87000; GVAR(gurney_c) = 2320; - GVAR(gurney_k) = 1/2; + GVAR(gurney_k) = "1/2"; }; // ~~~~ Grenades: @@ -52,7 +52,7 @@ class CfgAmmo { GVAR(metal) = 210; // metal in grams GVAR(charge) = 185; // explosive in grams GVAR(gurney_c) = 2843; // Gurney velocity constant for explosive type. See: http://en.wikipedia.org/wiki/Gurney_equations - GVAR(gurney_k) = 3/5; // Gurney shape factor, in this case a sphere. See: http://en.wikipedia.org/wiki/Gurney_equations + GVAR(gurney_k) = "3/5"; // Gurney shape factor, in this case a sphere. See: http://en.wikipedia.org/wiki/Gurney_equations }; class GrenadeHand_stone: GrenadeHand { GVAR(skip) = 1; @@ -69,7 +69,7 @@ class CfgAmmo { GVAR(metal) = 200; GVAR(charge) = 32; GVAR(gurney_c) = 2700; - GVAR(gurney_k) = 1/2; + GVAR(gurney_k) = "1/2"; }; class G_40mm_HEDP: G_40mm_HE { // Source: http://www.inetres.com/gp/military/infantry/grenade/40mm_ammo.html#M433 @@ -79,7 +79,7 @@ class CfgAmmo { GVAR(metal) = 200; GVAR(charge) = 45; GVAR(gurney_c) = 2830; - GVAR(gurney_k) = 1/2; + GVAR(gurney_k) = "1/2"; }; class ACE_G_40mm_HEDP: G_40mm_HEDP {}; @@ -130,7 +130,7 @@ class CfgAmmo { GVAR(metal) = 2300; GVAR(charge) = 590; GVAR(gurney_c) = 2800; - GVAR(gurney_k) = 1/2; + GVAR(gurney_k) = "1/2"; GVAR(classes)[] = {"ACE_frag_small"}; }; @@ -145,7 +145,7 @@ class CfgAmmo { GVAR(metal) = 3850; GVAR(charge) = 1040; GVAR(gurney_c) = 2700; - GVAR(gurney_k) = 1/2; + GVAR(gurney_k) = "1/2"; }; class RocketBase; class R_80mm_HE: RocketBase { @@ -159,7 +159,7 @@ class CfgAmmo { GVAR(metal) = 56250; GVAR(charge) = 39000; GVAR(gurney_c) = 2700; - GVAR(gurney_k) = 1/2; + GVAR(gurney_k) = "1/2"; }; class Rocket_04_HE_F: MissileBase { // Shrieker (Hydra 70) GVAR(enabled) = 1; @@ -167,7 +167,7 @@ class CfgAmmo { GVAR(metal) = 3850; GVAR(charge) = 1040; GVAR(gurney_c) = 2700; - GVAR(gurney_k) = 1/2; + GVAR(gurney_k) = "1/2"; }; class M_Scalpel_AT: MissileBase { // 9K121 Vikhr GVAR(enabled) = 1; @@ -175,7 +175,7 @@ class CfgAmmo { GVAR(metal) = 10000; GVAR(charge) = 3000; GVAR(gurney_c) = 2700; - GVAR(gurney_k) = 1/2; + GVAR(gurney_k) = "1/2"; }; class ACE_Hellfire_AGM114K: M_Scalpel_AT { // Source: http://www.designation-systems.net/dusrm/m-114.html @@ -185,7 +185,7 @@ class CfgAmmo { GVAR(metal) = 8000; GVAR(charge) = 2400; GVAR(gurney_c) = 2700; - GVAR(gurney_k) = 1/2; + GVAR(gurney_k) = "1/2"; }; class M_Air_AA: MissileBase { GVAR(skip) = 1; @@ -205,7 +205,7 @@ class CfgAmmo { GVAR(metal) = 36000; GVAR(charge) = 9979; GVAR(gurney_c) = 2440; - GVAR(gurney_k) = 1/2; + GVAR(gurney_k) = "1/2"; }; class Sh_82mm_AMOS: Sh_155mm_AMOS { // Source: http://www.arsenal-bg.com/defense_police/mortar_bombs_82mm.htm @@ -215,7 +215,7 @@ class CfgAmmo { GVAR(metal) = 3200; GVAR(charge) = 420; GVAR(gurney_c) = 2440; - GVAR(gurney_k) = 1/2; + GVAR(gurney_k) = "1/2"; }; class ModuleOrdnanceMortar_F_Ammo: Sh_82mm_AMOS { GVAR(enabled) = 1; @@ -224,7 +224,7 @@ class CfgAmmo { GVAR(metal) = 800; GVAR(charge) = 4200; GVAR(gurney_c) = 2320; - GVAR(gurney_k) = 1/2; + GVAR(gurney_k) = "1/2"; }; class Sh_105mm_HEAT_MP: Sh_125mm_HEAT { GVAR(enabled) = 1; @@ -233,7 +233,7 @@ class CfgAmmo { GVAR(metal) = 11400; GVAR(charge) = 7100; GVAR(gurney_c) = 2800; - GVAR(gurney_k) = 1/2; + GVAR(gurney_k) = "1/2"; }; class Sh_120mm_HE: ShellBase { GVAR(enabled) = 1; @@ -242,7 +242,7 @@ class CfgAmmo { GVAR(metal) = 23000; GVAR(charge) = 3148; GVAR(gurney_c) = 2830; - GVAR(gurney_k) = 1/2; + GVAR(gurney_k) = "1/2"; }; class Sh_125mm_HE: Sh_120mm_HE { GVAR(enabled) = 1; @@ -251,7 +251,7 @@ class CfgAmmo { GVAR(metal) = 16000; GVAR(charge) = 3200; GVAR(gurney_c) = 2440; - GVAR(gurney_k) = 1/2; + GVAR(gurney_k) = "1/2"; }; class ModuleOrdnanceHowitzer_F_ammo: Sh_155mm_AMOS { GVAR(enabled) = 1; @@ -260,7 +260,7 @@ class CfgAmmo { GVAR(metal) = 1950; GVAR(charge) = 15800; GVAR(gurney_c) = 2320; - GVAR(gurney_k) = 1/2; + GVAR(gurney_k) = "1/2"; }; @@ -279,29 +279,29 @@ class CfgAmmo { class GVAR(tiny_HD): GVAR(base) { hit = 6; - airFriction = BASE_DRAG_HD; + airFriction = QUOTE(BASE_DRAG_HD); caliber = 0.75; }; class GVAR(small): GVAR(base) { hit = 12; - airFriction = BASE_DRAG*0.9; + airFriction = QUOTE(BASE_DRAG*0.9); }; class GVAR(small_HD): GVAR(base) { hit = 12; - airFriction = BASE_DRAG_HD*0.9; + airFriction = QUOTE(BASE_DRAG_HD*0.9); }; class GVAR(medium): GVAR(base) { hit = 14; - airFriction = BASE_DRAG*0.75; + airFriction = QUOTE(BASE_DRAG*0.75); caliber = 1.2; }; class GVAR(medium_HD): GVAR(base) { hit = 14; - airFriction = BASE_DRAG_HD*0.75; + airFriction = QUOTE(BASE_DRAG_HD*0.75); caliber = 1.2; }; @@ -309,7 +309,7 @@ class CfgAmmo { hit = 28; indirectHit = 2; indirectHitRange = 0.25; - airFriction = BASE_DRAG*0.65; + airFriction = QUOTE(BASE_DRAG*0.65); caliber = 2; explosive = 0; @@ -319,7 +319,7 @@ class CfgAmmo { hit = 28; indirectHit = 2; indirectHitRange = 0.25; - airFriction = BASE_DRAG_HD*0.65; + airFriction = QUOTE(BASE_DRAG_HD*0.65); caliber = 2; }; @@ -327,7 +327,7 @@ class CfgAmmo { hit = 40; indirectHit = 4; indirectHitRange = 0.5; - airFriction = BASE_DRAG*0.5; + airFriction = QUOTE(BASE_DRAG*0.5); caliber = 2.8; }; @@ -335,7 +335,7 @@ class CfgAmmo { hit = 40; indirectHit = 4; indirectHitRange = 0.5; - airFriction = BASE_DRAG_HD*0.5; + airFriction = QUOTE(BASE_DRAG_HD*0.5); caliber = 2.8; }; diff --git a/addons/frag/CfgAmmoReflections.hpp b/addons/frag/CfgAmmoReflections.hpp index 41bd0d5c31..a6183eaa7b 100644 --- a/addons/frag/CfgAmmoReflections.hpp +++ b/addons/frag/CfgAmmoReflections.hpp @@ -2,8 +2,8 @@ class ace_explosion_reflection_##range##_##hit: ace_explosion_reflection_base {\ indirectHitRange = range;\ indirectHit = hit;\ - dangerRadiusHit = range*3;\ - suppressionRadiusHit = range*2;\ + dangerRadiusHit = QUOTE(range*3);\ + suppressionRadiusHit = QUOTE(range*2);\ } #define ACE_EXPLOSION_RANGE(range)\ diff --git a/addons/goggles/config.cpp b/addons/goggles/config.cpp index 5d33d5ea19..f39ab4d458 100644 --- a/addons/goggles/config.cpp +++ b/addons/goggles/config.cpp @@ -58,13 +58,13 @@ class CfgGlasses { }; class G_Lowprofile: None { - ACE_TintAmount=COLOUR*2; + ACE_TintAmount=QUOTE(COLOUR*2); ACE_Resistance = 2; ACE_Protection = 1; }; class G_Shades_Black: None { - ACE_TintAmount=COLOUR*2; + ACE_TintAmount=QUOTE(COLOUR*2); ACE_Resistance = 1; }; @@ -92,7 +92,7 @@ class CfgGlasses { }; class G_Spectacles_Tinted: None { - ACE_TintAmount=COLOUR*2; + ACE_TintAmount=QUOTE(COLOUR*2); ACE_Resistance = 1; }; @@ -109,22 +109,22 @@ class CfgGlasses { }; class G_Sport_Blackyellow: None { - ACE_TintAmount=COLOUR*2; + ACE_TintAmount=QUOTE(COLOUR*2); ACE_Resistance = 1; }; class G_Sport_Checkered: None { - ACE_TintAmount=COLOUR*2; + ACE_TintAmount=QUOTE(COLOUR*2); ACE_Resistance = 1; }; class G_Sport_Greenblack: None { - ACE_TintAmount=COLOUR*2; + ACE_TintAmount=QUOTE(COLOUR*2); ACE_Resistance = 1; }; class G_Sport_Red: None { - ACE_TintAmount=COLOUR*2; + ACE_TintAmount=QUOTE(COLOUR*2); ACE_Color[] = {0,0,0}; ACE_Resistance = 1; }; @@ -170,7 +170,7 @@ class CfgGlasses { }; class G_Lady_Dark: None { - ACE_TintAmount=COLOUR*2; + ACE_TintAmount=QUOTE(COLOUR*2); ACE_Resistance = 1; }; @@ -186,7 +186,7 @@ class CfgGlasses { }; class G_Balaclava_lowprofile: G_Balaclava_blk { - ACE_TintAmount=COLOUR*2; + ACE_TintAmount=QUOTE(COLOUR*2); ACE_Resistance = 2; ACE_Protection = 1; }; @@ -203,7 +203,7 @@ class CfgGlasses { class G_Bandanna_blk; class G_Bandanna_shades: G_Bandanna_blk { - ACE_TintAmount=COLOUR*2; + ACE_TintAmount=QUOTE(COLOUR*2); ACE_Resistance = 1; ACE_Protection = 1; }; diff --git a/addons/goggles/define.hpp b/addons/goggles/define.hpp index 38271ccc67..81d3fcb689 100644 --- a/addons/goggles/define.hpp +++ b/addons/goggles/define.hpp @@ -18,8 +18,8 @@ class RscPicture { fixedWidth = 0; shadow = 0; text = ""; - x = safezoneX; - y = safezoneY; - w = safezoneW; - h = safezoneH; + x = "safezoneX"; + y = "safezoneY"; + w = "safezoneW"; + h = "safezoneH"; }; diff --git a/addons/hot/CfgAmmo.hpp b/addons/hot/CfgAmmo.hpp index dee076be0e..1be8c6067f 100644 --- a/addons/hot/CfgAmmo.hpp +++ b/addons/hot/CfgAmmo.hpp @@ -112,7 +112,7 @@ class CfgAmmo { EGVAR(frag,metal) = 7100; // 1000 steel balls EGVAR(frag,charge) = 4100; EGVAR(frag,gurney_c) = 2700; - EGVAR(frag,gurney_k) = 3/5; + EGVAR(frag,gurney_k) = "3/5"; EGVAR(frag,classes)[] = {"ACE_frag_small"}; displayName = CSTRING(hot2mp); diff --git a/addons/huntir/CfgVehicles.hpp b/addons/huntir/CfgVehicles.hpp index 03243cfbdd..2a30cec6fa 100644 --- a/addons/huntir/CfgVehicles.hpp +++ b/addons/huntir/CfgVehicles.hpp @@ -24,10 +24,10 @@ class CfgVehicles { displayName = "HuntIR"; model = QPATHTOF(data\huntir.p3d); scope = 1; - soundCrash[] = {"", db-30, 1 }; + soundCrash[] = {"", "db-30", 1 }; soundEnviron[] = {"z\ace\addons\apl\sounds\padak_let", 0.316228, 1, 80}; - soundLandCrash[] = {"", db-30, 1 }; - soundWaterCrash[] = {"", db10, 1 }; + soundLandCrash[] = {"", "db-30", 1 }; + soundWaterCrash[] = {"", "db-10", 1 }; class HitPoints { class HitEngine { armor = 0; diff --git a/addons/huntir/Dialog.hpp b/addons/huntir/Dialog.hpp index 18c5ac1339..e6cc28e327 100644 --- a/addons/huntir/Dialog.hpp +++ b/addons/huntir/Dialog.hpp @@ -64,33 +64,33 @@ class GVAR(cam_dialog) { controlsBackground[] = { }; objects[] = { }; controls[] = { - TOP_BORDER, - BOTTOM_BORDER, - LEFT_BORDER, - RIGHT_BORDER, - //HELP_DIALOG, - CAM_BG, - CAM_HEIGHT, - CAM_ALT, - CAM_No, - CAM_NO_x, - CAM_TIME_REMAIN, - CAM_TIME, - CAM_ZOOM, - ZOOM_X, - CAM_POS, - CAM_POS_X, - CAM_DIR, - CAM_DIR_x + "TOP_BORDER", + "BOTTOM_BORDER", + "LEFT_BORDER", + "RIGHT_BORDER", + //"HELP_DIALOG", + "CAM_BG", + "CAM_HEIGHT", + "CAM_ALT", + "CAM_No", + "CAM_NO_x", + "CAM_TIME_REMAIN", + "CAM_TIME", + "CAM_ZOOM", + "ZOOM_X", + "CAM_POS", + "CAM_POS_X", + "CAM_DIR", + "CAM_DIR_x" }; class TOP_BORDER { idc = -1; type = CT_STATIC; style = ST_CENTER; - x = __XA; - y = __Y; - w = __WA; + x = QUOTE(__XA); + y = QUOTE(__Y); + w = QUOTE(__WA); h = 0.08; font = FontM; sizeEx = 0.04; @@ -100,17 +100,17 @@ class GVAR(cam_dialog) { blinkingPeriod = 0; }; class BOTTOM_BORDER: TOP_BORDER { - y = __Y + __H - 0.05; + y = QUOTE(__Y + __H - 0.05); h = 0.05; }; class LEFT_BORDER: TOP_BORDER { - w = (abs(__XA) - abs(__X)) + 0.05; - h = __H; + w = QUOTE((abs(__XA) - abs(__X)) + 0.05); + h = QUOTE(__H); }; class RIGHT_BORDER: TOP_BORDER { - x = __X + __W - 0.05; - w = (__WA - __W) + 0.05; - h = __H; + x = QUOTE(__X + __W - 0.05); + w = QUOTE((__WA - __W) + 0.05); + h = QUOTE(__H); }; class HELP_DIALOG { idc = -1; @@ -135,8 +135,10 @@ class GVAR(cam_dialog) { soundPush[] = { "buttonpushed.ogg", 0.1, 1 }; soundClick[] = { "", 0, 1 }; soundEscape[] = { "", 0, 1 }; - x = __X + (2*0.8); y = __Y + 0.045; - w = 0.05; h = 0.02; + x = QUOTE(__X + (2*0.8)); + y = QUOTE(__Y + 0.045); + w = 0.05; + h = 0.02; text = CSTRING(HELP); action = QUOTE(createDialog QQGVAR(help_dialog)); }; @@ -149,10 +151,10 @@ class GVAR(cam_dialog) { font = "RobotoCondensed"; sizeEx = 0.021; lineSpacing = 1; - x = __X; - y = __Y + 0.08; - w = __W; - h = __H + 0.2; + x = QUOTE(__X); + y = QUOTE(__Y + 0.08); + w = QUOTE(__W); + h = QUOTE(__H + 0.2); border = 0; text = QPATHTOF(UI\ace_huntir_monitor_on.paa); }; @@ -164,65 +166,65 @@ class GVAR(cam_dialog) { colorText[] = {1, 1, 1, 1}; font = FontM; sizeEx = 0.02; - x = __X + 0.42; - y = __Y + 0.32; + x = QUOTE(__X + 0.42); + y = QUOTE(__Y + 0.32); w = 0.08; h = 0.04; text = ""; blinkingPeriod = 0; }; class CAM_ALT: CAM_HEIGHT { - x = __X + 0.35; + x = QUOTE(__X + 0.35); text = CSTRING(ALT); }; class CAM_No: CAM_HEIGHT { - x = __X + __W - 0.64; + x = QUOTE(__X + __W - 0.64); text = CSTRING(CAM); }; class CAM_NO_x: CAM_HEIGHT { idc = 2; - x = __X + __W - 0.56; - y = __Y + 0.32; + x = QUOTE(__X + __W - 0.56); + y = QUOTE(__Y + 0.32); text = ""; }; class CAM_TIME: CAM_HEIGHT { - x = __X + 0.35; - y = __Y + __H - 0.65; + x = QUOTE(__X + 0.35); + y = QUOTE(__Y + __H - 0.65); w = 0.12; text = CSTRING(TIME); }; class CAM_TIME_REMAIN: CAM_TIME { idc = 3; - x = __X + 0.46; + x = QUOTE(__X + 0.46); text = ""; }; class CAM_ZOOM: CAM_No { - y = __Y + 0.36; + y = QUOTE(__Y + 0.36); text = "Zoom:"; }; class ZOOM_X: CAM_ZOOM { idc = 4; - x = __X + __W - 0.56; + x = QUOTE(__X + __W - 0.56); text = ""; }; class CAM_POS: CAM_HEIGHT { - x = __X + 0.35; - y = __Y + 0.36; + x = QUOTE(__X + 0.35); + y = QUOTE(__Y + 0.36); text = "GPS Pos:"; }; class CAM_POS_X: CAM_POS { idc = 5; - x = __X + 0.42; + x = QUOTE(__X + 0.42); w = 0.16; text = ""; }; class CAM_DIR: CAM_POS { - y = __Y + 0.4; + y = QUOTE(__Y + 0.4); text = ""; //"Az:"; }; class CAM_DIR_x: CAM_DIR { idc = 6; - x = __X + 0.42; + x = QUOTE(__X + 0.42); w = 0.16; text = ""; }; @@ -231,14 +233,14 @@ class GVAR(cam_dialog) { class GVAR(cam_dialog_inactive): GVAR(cam_dialog) { idd = 18881; controls[] = { - TOP_BORDER, - BOTTOM_BORDER, - LEFT_BORDER, - RIGHT_BORDER, - //HELP_DIALOG, - //PRESS_HELP, - CAM_BG, - SEARCHING_CAM + "TOP_BORDER", + "BOTTOM_BORDER", + "LEFT_BORDER", + "RIGHT_BORDER", + //"HELP_DIALOG", + //"PRESS_HELP", + "CAM_BG", + "SEARCHING_CAM" }; class TOP_BORDER: TOP_BORDER {}; @@ -249,8 +251,8 @@ class GVAR(cam_dialog_inactive): GVAR(cam_dialog) { idc = -1; type = CT_STATIC; style = ST_LEFT; - x = __X + (__W - 0.2); - y = __Y + 0.06; + x = QUOTE(__X + (__W - 0.2)); + y = QUOTE(__Y + 0.06); w = 0.4; h = 0.02; font = FontM; @@ -264,8 +266,8 @@ class GVAR(cam_dialog_inactive): GVAR(cam_dialog) { idc = -1; type = CT_STATIC; style = ST_LEFT; - x = __X + (__W - 0.2); - y = __Y + 0.03; + x = QUOTE(__X + (__W - 0.2)); + y = QUOTE(__Y + 0.03); w = 0.4; h = 0.02; font = FontM; @@ -282,8 +284,8 @@ class GVAR(cam_dialog_inactive): GVAR(cam_dialog) { style = ST_LEFT; colorText[] = {1, 1, 1, 1}; colorBackground[] = {0,0,0,0}; - x = __X + (__W/2) - 0.07; - y = __Y + (__H/2); + x = QUOTE(__X + (__W/2) - 0.07); + y = QUOTE(__Y + (__H/2)); w = 0.6; h = 0.08; font = FontM; @@ -296,13 +298,13 @@ class GVAR(cam_dialog_inactive): GVAR(cam_dialog) { class GVAR(cam_dialog_off): GVAR(cam_dialog_inactive) { idd = 18882; controls[] = { - TOP_BORDER, - BOTTOM_BORDER, - LEFT_BORDER, - RIGHT_BORDER, - //HELP_DIALOG, - //PRESS_HELP, - CAM_BG + "TOP_BORDER", + "BOTTOM_BORDER", + "LEFT_BORDER", + "RIGHT_BORDER", + //"HELP_DIALOG", + //"PRESS_HELP", + "CAM_BG" }; class TOP_BORDER: TOP_BORDER {}; @@ -317,30 +319,30 @@ class GVAR(cam_dialog_off): GVAR(cam_dialog_inactive) { class GVAR(help_dialog): GVAR(cam_dialog) { idd = -1; controls[] = { - TOP_BORDER, - BOTTOM_BORDER, - LEFT_BORDER, - RIGHT_BORDER, - CAM_BG, - CAM_HEIGHT, - CAM_ALT, - CAM_TIME_REMAIN, - CAM_TIME, - CAM_ZOOM, - ZOOM_X, - CAM_POS, - CAM_POS_x, - CAM_No, - CAM_No_X, - CAM_DIR, - CAM_DIR_x, - HELP0, - HELP1, - HELP2, - HELP3, - HELP4, - HELP5, - HELP6 + "TOP_BORDER", + "BOTTOM_BORDER", + "LEFT_BORDER", + "RIGHT_BORDER", + "CAM_BG", + "CAM_HEIGHT", + "CAM_ALT", + "CAM_TIME_REMAIN", + "CAM_TIME", + "CAM_ZOOM", + "ZOOM_X", + "CAM_POS", + "CAM_POS_x", + "CAM_No", + "CAM_No_X", + "CAM_DIR", + "CAM_DIR_x", + "HELP0", + "HELP1", + "HELP2", + "HELP3", + "HELP4", + "HELP5", + "HELP6" }; class TOP_BORDER: TOP_BORDER {}; class BOTTOM_BORDER: BOTTOM_BORDER {}; @@ -363,8 +365,8 @@ class GVAR(help_dialog): GVAR(cam_dialog) { idc = -1; type = CT_STATIC; style = ST_LEFT; - x = __X + (__W - 0.3); - y = __Y + 0.03; + x = QUOTE(__X + (__W - 0.3)); + y = QUOTE(__Y + 0.03); w = 0.4; h = 0.03; font = FontM; @@ -375,27 +377,27 @@ class GVAR(help_dialog): GVAR(cam_dialog) { blinkingPeriod = 0; }; class HELP1: HELP0 { - y = __Y + 0.06; + y = QUOTE(__Y + 0.06); text = CSTRING(HELP_ZOOM); }; class HELP2: HELP0 { - y = __Y + 0.09; + y = QUOTE(__Y + 0.09); text = CSTRING(HELP_CAM); }; class HELP3: HELP0 { - y = __Y + 0.12; + y = QUOTE(__Y + 0.12); text = CSTRING(HELP_ROT); }; class HELP4: HELP0 { - y = __Y + 0.15; + y = QUOTE(__Y + 0.15); text = CSTRING(HELP_ELV); }; class HELP5: HELP0 { - y = __Y + 0.18; + y = QUOTE(__Y + 0.18); text = CSTRING(HELP_MOD); }; class HELP6: HELP0 { - y = __Y + 0.21; + y = QUOTE(__Y + 0.21); text = CSTRING(HELP_RES); }; }; diff --git a/addons/huntir/RscTitles.hpp b/addons/huntir/RscTitles.hpp index 7d2e06fa6b..e9ad860d68 100644 --- a/addons/huntir/RscTitles.hpp +++ b/addons/huntir/RscTitles.hpp @@ -14,7 +14,10 @@ class RscTitles { type = 0; idc = 64432; style = 0; - x = 0.497;y = 0.297;w = 0.2;h = 0.2; + x = 0.497; + y = 0.297; + w = 0.2; + h = 0.2; font = "RobotoCondensed"; sizeEx = __FONTHEIGHT; colorText[] = {1, 1, 1, 1}; @@ -23,17 +26,20 @@ class RscTitles { }; class CHAR_E: CHAR_N { idc = 64433; - x = 0.697;y = 0.497; + x = 0.697; + y = 0.497; text = "E"; }; class CHAR_S: CHAR_N { idc = 64434; - x = 0.497;y = 0.697; + x = 0.497; + y = 0.697; text = "S"; }; class CHAR_W: CHAR_N { idc = 64435; - x = 0.297;y = 0.497; + x = 0.297; + y = 0.497; text = "W"; }; }; diff --git a/addons/intelitems/gui.hpp b/addons/intelitems/gui.hpp index 2c26b8ccc9..e5e9d4a1f2 100644 --- a/addons/intelitems/gui.hpp +++ b/addons/intelitems/gui.hpp @@ -9,42 +9,42 @@ class GVAR(RscBase): ctrlControlsGroupNoScrollbars { idc = -1; x = 0; y = 0; - w = POS_W(15); - h = POS_H(18); + w = QUOTE(POS_W(15)); + h = QUOTE(POS_H(18)); class controls { class Border: ctrlStatic { idc = IDC_BORDER; x = 0; y = 0; - w = POS_W(15); - h = POS_H(18); + w = QUOTE(POS_W(15)); + h = QUOTE(POS_H(18)); colorBackground[] = {0, 0, 0, 1}; }; class Background: ctrlStatic { idc = IDC_BACKGROUND; - x = pixelW; - y = pixelH; - w = POS_W(15) - 2 * pixelW; - h = POS_H(18) - 2 * pixelH; + x = QUOTE(pixelW); + y = QUOTE(pixelH); + w = QUOTE(POS_W(15) - 2 * pixelW); + h = QUOTE(POS_H(18) - 2 * pixelH); colorBackground[] = {1, 1, 1, 1}; }; class Header: ctrlStatic { idc = IDC_HEADER; - style = ST_MULTI + ST_NO_RECT; + style = QUOTE(ST_MULTI + ST_NO_RECT); x = 0; y = 0; - w = POS_W(14.3); - h = POS_H(0.7); - sizeEx = POS_H(0.65); + w = QUOTE(POS_W(14.3)); + h = QUOTE(POS_H(0.7)); + sizeEx = QUOTE(POS_H(0.65)); colorBackground[] = {0.1, 0.1, 0.1, 1}; }; class Close: ctrlButtonPicture { idc = IDC_CLOSE; text = "\a3\3DEN\Data\Displays\Display3DEN\search_end_ca.paa"; - x = POS_W(14.3); + x = QUOTE(POS_W(14.3)); y = 0; - w = POS_W(0.7); - h = POS_H(0.7); + w = QUOTE(POS_W(0.7)); + h = QUOTE(POS_H(0.7)); offsetPressedX = 0; offsetPressedY = 0; colorBackground[] = {0.1, 0.1, 0.1, 1}; @@ -64,13 +64,13 @@ class GVAR(RscNotepad): GVAR(RscBase) { class Close: Close {}; class Content: ctrlEditMulti { idc = IDC_CONTENT; - style = ST_MULTI + ST_NO_RECT; + style = QUOTE(ST_MULTI + ST_NO_RECT); font = "EtelkaMonospaceProBold"; - x = pixelW; - y = POS_H(0.7); - w = POS_W(15) - 2 * pixelW; - h = POS_H(17.3) - pixelH; - sizeEx = POS_H(0.9); + x = QUOTE(pixelW); + y = QUOTE(POS_H(0.7)); + w = QUOTE(POS_W(15) - 2 * pixelW); + h = QUOTE(POS_H(17.3) - pixelH); + sizeEx = QUOTE(POS_H(0.9)); shadow = 0; colorText[] = {0, 0, 0, 1}; colorBackground[] = {0, 0, 0, 0}; @@ -91,11 +91,11 @@ class GVAR(RscDocument): GVAR(RscBase) { class Content: ctrlStaticMulti { idc = IDC_CONTENT; font = "EtelkaMonospaceProBold"; - x = pixelW; - y = POS_H(0.7); - w = POS_W(15) - 2 * pixelW; - h = POS_H(17.3) - pixelH; - sizeEx = POS_H(0.9); + x = QUOTE(pixelW); + y = QUOTE(POS_H(0.7)); + w = QUOTE(POS_W(15) - 2 * pixelW); + h = QUOTE(POS_H(17.3) - pixelH); + sizeEx = QUOTE(POS_H(0.9)); shadow = 0; colorText[] = {0, 0, 0, 1}; colorBackground[] = {0, 0, 0, 0}; @@ -104,27 +104,27 @@ class GVAR(RscDocument): GVAR(RscBase) { }; class GVAR(RscPhoto): GVAR(RscBase) { - w = POS_W(18); + w = QUOTE(POS_W(18)); class controls: controls { class Border: Border { - w = POS_W(18); + w = QUOTE(POS_W(18)); }; class Background: Background { - w = POS_W(18) - 2 * pixelW; + w = QUOTE(POS_W(18) - 2 * pixelW); }; class Header: Header { text = CSTRING(Photo_DisplayName); - w = POS_W(17.3); + w = QUOTE(POS_W(17.3)); }; class Close: Close { - x = POS_W(17.3); + x = QUOTE(POS_W(17.3)); }; class Content: ctrlStaticPictureKeepAspect { idc = IDC_CONTENT; - x = pixelW; - y = POS_H(0.7); - w = POS_W(18) - 2 * pixelW; - h = POS_H(17.3) - pixelH; + x = QUOTE(pixelW); + y = QUOTE(POS_H(0.7)); + w = QUOTE(POS_W(18) - 2 * pixelW); + h = QUOTE(POS_H(17.3) - pixelH); }; }; }; @@ -160,24 +160,24 @@ class GVAR(RscSetData): RscDisplayAttributes { idc = IDC_ATTRIBUTE_GROUP; x = 0; y = 0; - w = POS_W(26); - h = POS_H(6); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(6)); class controls { class Label: RscText { idc = IDC_ATTRIBUTE_LABEL; x = 0; y = 0; - w = POS_W(26); - h = POS_H(1); + w = QUOTE(POS_W(26)); + h = QUOTE(POS_H(1)); colorBackground[] = {0, 0, 0, 0.5}; }; class Edit: RscEditMulti { idc = IDC_ATTRIBUTE_EDIT; - x = pixelW; - y = POS_H(1) + pixelH; - w = POS_W(26) - pixelW; - h = POS_H(5) - pixelH; - sizeEx = POS_H(0.9); + x = QUOTE(pixelW); + y = QUOTE(POS_H(1) + pixelH); + w = QUOTE(POS_W(26) - pixelW); + h = QUOTE(POS_H(5) - pixelH); + sizeEx = QUOTE(POS_H(0.9)); }; }; }; diff --git a/addons/interaction/RscTitles.hpp b/addons/interaction/RscTitles.hpp index 0ac0e18241..8857faf4b6 100644 --- a/addons/interaction/RscTitles.hpp +++ b/addons/interaction/RscTitles.hpp @@ -13,8 +13,8 @@ class ACE_Interaction_Button_Base { style = 2; x = 0; y = 0; - w = 2.0 / 16 * safezoneW; - h = 0.3 / 9 * safezoneH; + w = "2.0 / 16 * safezoneW"; + h = "0.3 / 9 * safezoneH"; offsetX = 0.003; offsetY = 0.003; @@ -59,7 +59,7 @@ class RscACE_SelectAnItem { }; class header: RscText { idc = 8870; - x = X_OFFSET + 0.005; + x = QUOTE(X_OFFSET + 0.005); y = 0.005; w = 0.59; h = 0.05; @@ -69,7 +69,7 @@ class RscACE_SelectAnItem { class itemList: RscListBox { onMouseButtonDblClick = QUOTE(_this call DFUNC(onSelectMenuDblClick)); idc = 8866; - x = X_OFFSET + 0.005; + x = QUOTE(X_OFFSET + 0.005); w = 0.59; h = 0.54; y = 0.06; @@ -81,7 +81,7 @@ class RscACE_SelectAnItem { idc = -1; colorBackground[] = {0,0,0,0.5}; colorBackgroundDisabled[] = {0,0,0,0.5}; - x = X_OFFSET + 0.005; + x = QUOTE(X_OFFSET + 0.005); w = 0.15; h = 0.1; y = 0.605; @@ -92,7 +92,7 @@ class RscACE_SelectAnItem { idc = -1; colorBackground[] = {0,0,0,0.5}; colorBackgroundDisabled[] = {0,0,0,0.5}; - x = X_OFFSET + 0.445; + x = QUOTE(X_OFFSET + 0.445); y = 0.605; h = 0.1; w = 0.15; @@ -100,7 +100,7 @@ class RscACE_SelectAnItem { class cancelBtn: ACE_Interaction_Button_Base { idc = 8855; - x = X_OFFSET + 0.005; + x = QUOTE(X_OFFSET + 0.005); w = 0.15; h = 0.1; y = 0.605; @@ -114,7 +114,7 @@ class RscACE_SelectAnItem { }; class approveBtn: ACE_Interaction_Button_Base { idc = 8860; - x = X_OFFSET + 0.445; + x = QUOTE(X_OFFSET + 0.445); y = 0.605; h = 0.1; w = 0.15; @@ -141,37 +141,37 @@ class RscTitles { class IconLMB: RscPicture { idc = IDC_MOUSEHINT_LMB; text = QPATHTOF(UI\mouse_left_ca.paa); - x = 20 * GUI_GRID_W + GUI_GRID_CENTER_X; - y = 17.5 * GUI_GRID_H; - w = GUI_GRID_H; - h = GUI_GRID_H; + x = QUOTE(20 * GUI_GRID_W + GUI_GRID_CENTER_X); + y = QUOTE(17.5 * GUI_GRID_H); + w = QUOTE(GUI_GRID_H); + h = QUOTE(GUI_GRID_H); }; class TextLMB: RscText { idc = IDC_MOUSEHINT_LMB_TEXT; text = ""; - x = 21.1 * GUI_GRID_W + GUI_GRID_CENTER_X; - y = 17.45 * GUI_GRID_H; - w = 24 * GUI_GRID_W; - h = GUI_GRID_H; - sizeEx = GUI_GRID_H; + x = QUOTE(21.1 * GUI_GRID_W + GUI_GRID_CENTER_X); + y = QUOTE(17.45 * GUI_GRID_H); + w = QUOTE(24 * GUI_GRID_W); + h = QUOTE(GUI_GRID_H); + sizeEx = QUOTE(GUI_GRID_H); }; class IconMMB: IconLMB { idc = IDC_MOUSEHINT_MMB; text = QPATHTOF(UI\mouse_scroll_ca.paa); - y = 18.55 * GUI_GRID_H; + y = QUOTE(18.55 * GUI_GRID_H); }; class TextMMB: TextLMB { idc = IDC_MOUSEHINT_MMB_TEXT; - y = 18.5 * GUI_GRID_H; + y = QUOTE(18.5 * GUI_GRID_H); }; class IconRMB: IconLMB { idc = IDC_MOUSEHINT_RMB; text = QPATHTOF(UI\mouse_right_ca.paa); - y = 19.6 * GUI_GRID_H; + y = QUOTE(19.6 * GUI_GRID_H); }; class TextRMB: TextLMB { idc = IDC_MOUSEHINT_RMB_TEXT; - y = 19.55 * GUI_GRID_H; + y = QUOTE(19.55 * GUI_GRID_H); }; }; }; @@ -181,26 +181,26 @@ class GVAR(RscExtraKey): RscControlsGroupNoScrollbars { idc = IDC_MOUSEHINT_EXTRA; x = 0; y = 0; - w = 40 * GUI_GRID_W; - h = GUI_GRID_H; + w = QUOTE(40 * GUI_GRID_W); + h = QUOTE(GUI_GRID_H); class controls { class Name: RscText { idc = IDC_MOUSEHINT_EXTRA_NAME; style = 1; x = 0; y = 0; - w = 21.5 * GUI_GRID_W + GUI_GRID_CENTER_X; - h = GUI_GRID_H; - sizeEx = GUI_GRID_H; + w = QUOTE(21.5 * GUI_GRID_W + GUI_GRID_CENTER_X); + h = QUOTE(GUI_GRID_H); + sizeEx = QUOTE(GUI_GRID_H); font = "EtelkaMonospaceProBold"; }; class Text: RscText { idc = IDC_MOUSEHINT_EXTRA_TEXT; - x = 21.1 * GUI_GRID_W + GUI_GRID_CENTER_X; - y = 0; - w = 24 * GUI_GRID_W; - h = GUI_GRID_H; - sizeEx = GUI_GRID_H; + x = QUOTE(21.1 * GUI_GRID_W + GUI_GRID_CENTER_X); + y = QUOTE(0); + w = QUOTE(24 * GUI_GRID_W); + h = QUOTE(GUI_GRID_H); + sizeEx = QUOTE(GUI_GRID_H); }; }; }; diff --git a/addons/javelin/CfgSounds.hpp b/addons/javelin/CfgSounds.hpp index 9cd2627fa2..289a571e6e 100644 --- a/addons/javelin/CfgSounds.hpp +++ b/addons/javelin/CfgSounds.hpp @@ -2,12 +2,12 @@ class CfgSounds { class ACE_Javelin_Locking { name = "ACE_Javelin_Locking"; - sound[] = {PATHTOF(data\sounds\javelin_locking.ogg), db+0, 1.0}; + sound[] = {QPATHTOF(data\sounds\javelin_locking.ogg), "db+0", 1.0}; titles[] = {}; }; class ACE_Javelin_Locked { name = "ACE_Javelin_Locked"; - sound[] = {PATHTOF(data\sounds\javelin_locked.ogg), db+0, 1.0}; + sound[] = {QPATHTOF(data\sounds\javelin_locked.ogg), "db+0", 1.0}; titles[] = {}; }; }; diff --git a/addons/kestrel4500/CfgSound.hpp b/addons/kestrel4500/CfgSound.hpp index 5f7569647f..a657ef53f9 100644 --- a/addons/kestrel4500/CfgSound.hpp +++ b/addons/kestrel4500/CfgSound.hpp @@ -1,32 +1,32 @@ class CfgSounds { class kestrel4500_center_button_click { name="kestrel4500_center_button_click"; - sound[]={PATHTOF(sound\kestrel_center_button_click.wav),1,1}; + sound[]={QPATHTOF(sound\kestrel_center_button_click.wav),1,1}; titles[]={}; }; class kestrel4500_top_button_click { name="kestrel4500_top_button_click"; - sound[]={PATHTOF(sound\kestrel_top_button_click.wav),1,1}; + sound[]={QPATHTOF(sound\kestrel_top_button_click.wav),1,1}; titles[]={}; }; class kestrel4500_right_button_click { name="kestrel4500_right_button_click"; - sound[]={PATHTOF(sound\kestrel_right_button_click.wav),1,1}; + sound[]={QPATHTOF(sound\kestrel_right_button_click.wav),1,1}; titles[]={}; }; class kestrel4500_bottom_button_click { name="kestrel4500_bottom_button_click"; - sound[]={PATHTOF(sound\kestrel_bottom_button_click.wav),1,1}; + sound[]={QPATHTOF(sound\kestrel_bottom_button_click.wav),1,1}; titles[]={}; }; class kestrel4500_left_button_click { name="kestrel4500_left_button_click"; - sound[]={PATHTOF(sound\kestrel_left_button_click.wav),1,1}; + sound[]={QPATHTOF(sound\kestrel_left_button_click.wav),1,1}; titles[]={}; }; class kestrel4500_exit_button_click { name="kestrel4500_exit_button_click"; - sound[]={PATHTOF(sound\kestrel_exit_button_click.wav),1,1}; + sound[]={QPATHTOF(sound\kestrel_exit_button_click.wav),1,1}; titles[]={}; }; }; diff --git a/addons/kestrel4500/RscTitles.hpp b/addons/kestrel4500/RscTitles.hpp index 88d4cacb0e..faae6a8f32 100644 --- a/addons/kestrel4500/RscTitles.hpp +++ b/addons/kestrel4500/RscTitles.hpp @@ -64,26 +64,26 @@ class Kestrel4500_Display { SizeEX=0.025; idc=74000; style=48; - x=safezoneX; + x="safezoneX"; y = DIALOG_SAFE_Y(0); - w=1.024; - h=1.024*4/3; + w="1.024"; + h="1.024*4/3"; colorBackground[]={1,1,1,1}; colorText[]={1,1,1,1}; - text=PATHTOF(UI\Kestrel4500.paa); + text=QPATHTOF(UI\Kestrel4500.paa); }; class POWER: Kestrel4500_RscButton { idc=-1; - x=safezoneX+0.385; + x="safezoneX+0.385"; y = DIALOG_SAFE_Y(1.125); - w=0.042; - h=0.042*4/3; + w="0.042"; + h="0.042*4/3"; action=QUOTE(7 call FUNC(buttonPressed)); onMouseButtonDown = "playSound 'kestrel4500_exit_button_click'"; }; class ENTER: POWER { idc=-1; - x=safezoneX+0.46; + x="safezoneX+0.46"; y = DIALOG_SAFE_Y(1.0); w=0.1; action=QUOTE(0 call FUNC(buttonPressed)); @@ -91,7 +91,7 @@ class Kestrel4500_Display { }; class TOP: Kestrel4500_RscButton { idc=-1; - x=safezoneX+0.46; + x="safezoneX+0.46"; y = DIALOG_SAFE_Y(0.93); w=0.1; h=0.03; @@ -106,7 +106,7 @@ class Kestrel4500_Display { }; class LEFT: Kestrel4500_RscButton { idc=-1; - x=safezoneX+0.4; + x="safezoneX+0.4"; y = DIALOG_SAFE_Y(0.97); w=0.046; h=0.11; @@ -115,27 +115,27 @@ class Kestrel4500_Display { }; class RIGHT: LEFT { idc=-1; - x=safezoneX+0.58; + x="safezoneX+0.58"; action=QUOTE(4 call FUNC(buttonPressed)); onMouseButtonDown = "playSound 'kestrel4500_right_button_click'"; }; class MEMORY: Kestrel4500_RscButton { idc=-1; - x=safezoneX+0.395; + x="safezoneX+0.395"; y = DIALOG_SAFE_Y(0.87); w=0.05; - h=0.045*4/3; + h="0.045*4/3"; action=QUOTE(5 call FUNC(buttonPressed)); }; class BACKLIGHT: MEMORY { idc=-1; - x=safezoneX+0.585; + x="safezoneX+0.585"; action=QUOTE(6 call FUNC(buttonPressed)); }; class TEXT_TOP: Kestrel4500_RscText { idc=74100; - x=safezoneX+0.40; + x="safezoneX+0.40"; y = DIALOG_SAFE_Y(0.58); w=0.22; h=0.04; @@ -234,30 +234,30 @@ class RscTitles { moving=0; type=0; font="TahomaB"; - SizeEX=0.025*0.75; + SizeEX=".025*0.75"; style=48; - x=safezoneX+0.14; + x="safezoneX+0.14"; y = DISPLAY_SAFE_Y(0); - w=0.512*0.75; - h=1.024*4/3*0.75; + w="0.512*0.75"; + h="1.024*4/3*0.75"; colorBackground[]={1,1,1,1}; colorText[]={1,1,1,1}; - text=PATHTOF(UI\Kestrel4500_0.paa); + text=QPATHTOF(UI\Kestrel4500_0.paa); }; class RscTextTop: Kestrel4500_RscText { idc=75100; - x=safezoneX-0.05+0.40*0.75; + x="safezoneX-0.05+0.40*0.75"; y = DISPLAY_SAFE_Y(0.58*0.75); - w=0.22*0.75; - h=0.04*0.75; - SizeEx=0.04*0.75; + w="0.22*0.75"; + h="0.04*0.75"; + SizeEx="0.04*0.75"; text=""; }; class RscTextCenterBig: RscTextTop { idc=75200; y = DISPLAY_SAFE_Y(0.61*0.75); - h=0.10*0.75; - SizeEx=0.06*0.75; + h="0.10*0.75"; + SizeEx="0.06*0.75"; text=""; }; class RscTextCenter: RscTextTop { @@ -268,8 +268,8 @@ class RscTitles { idc=75300; y = DISPLAY_SAFE_Y(0.60*0.75); style=ST_LEFT; - h=0.10*0.75; - SizeEx=0.05*0.75; + h="0.10*0.75"; + SizeEx="0.05*0.75"; text=""; }; class RscTextCenterLine2Left: RscTextCenterLine1Left { @@ -307,14 +307,14 @@ class RscTitles { class RscTextBottomBig: RscTextTop { idc=75500; y = DISPLAY_SAFE_Y(0.67*0.75); - h=0.10*0.75; - SizeEx=0.06*0.75; + h="0.10*0.75"; + SizeEx="0.06*0.75"; text=""; }; class RscTextCenterLine1: RscTextTop { idc=75600; y = DISPLAY_SAFE_Y(0.58*0.75); - SizeEx=0.03*0.75; + SizeEx="0.03*0.75"; }; class RscTextCenterLine2: RscTextCenterLine1 { idc=75601; diff --git a/addons/map/MapTweaks.hpp b/addons/map/MapTweaks.hpp index 52edf29341..daafb58636 100644 --- a/addons/map/MapTweaks.hpp +++ b/addons/map/MapTweaks.hpp @@ -27,11 +27,11 @@ class Tree { }; class Legend { - x = SafeZoneX+SafeZoneW-.340; - y = SafeZoneY+SafeZoneH-.152; + x = "SafeZoneX+SafeZoneW-0.340"; + y = "SafeZoneY+SafeZoneH-0.152"; font = "RobotoCondensed"; - w = .340; - h = .152; + w = 0.340; + h = 0.152; sizeEx = 0.039210; colorBackground[] = {0.906000, 0.901000, 0.880000, 0.5}; color[] = {0, 0, 0, 0.75}; diff --git a/addons/maverick/config.cpp b/addons/maverick/config.cpp index dbfabf7f9d..6d5837f87d 100644 --- a/addons/maverick/config.cpp +++ b/addons/maverick/config.cpp @@ -1,7 +1,7 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { + class ADDON { name = COMPONENT_NAME; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_missileguidance"}; @@ -10,7 +10,7 @@ class CfgPatches { url = ECSTRING(main,URL); VERSION_CONFIG; ammo[] = { - GVAR(L), + QGVAR(L), "ace_kh25ml" }; magazines[] = { @@ -26,12 +26,12 @@ class CfgPatches { "ace_kh25ml_pylonmissile_int_x1" }; weapons[] = { - GVAR(L_Launcher_Plane), - GVAR(L_Launcher), + QGVAR(L_Launcher_Plane), + QGVAR(L_Launcher), "ace_kh25ml_launcher" }; units[] = {}; - }; + }; }; diff --git a/addons/medical_feedback/RscInGameUI.hpp b/addons/medical_feedback/RscInGameUI.hpp index cc2712d8ab..cbea0e35b5 100644 --- a/addons/medical_feedback/RscInGameUI.hpp +++ b/addons/medical_feedback/RscInGameUI.hpp @@ -1,3 +1,9 @@ +// Workaround required for new HEMTT, vanilla macros requires the use of auto-quote +#undef IGUI_GRID_STANCE_X +#undef IGUI_GRID_STANCE_Y +#define ace_IGUI_GRID_STANCE_X (profilenamespace getvariable ['IGUI_GRID_STANCE_X',IGUI_GRID_STANCE_XDef]) +#define ace_IGUI_GRID_STANCE_Y (profilenamespace getvariable ['IGUI_GRID_STANCE_Y',IGUI_GRID_STANCE_YDef]) + class RscPictureKeepAspect; class RscInGameUI { class RscStanceInfo { @@ -9,26 +15,26 @@ class RscInGameUI { }; class GVAR(bloodVolumeIndicator): RscPictureKeepAspect { onLoad = QUOTE(uiNamespace setVariable [ARR_2(QQGVAR(bloodVolumeIndicator),_this select 0)]); - x = IGUI_GRID_STANCE_X; - y = IGUI_GRID_STANCE_Y; - w = IGUI_GRID_STANCE_WAbs / 4; - h = IGUI_GRID_STANCE_HAbs / 4; + x = QUOTE(ace_IGUI_GRID_STANCE_X); + y = QUOTE(ace_IGUI_GRID_STANCE_Y); + w = QUOTE(IGUI_GRID_STANCE_WAbs / 4); + h = QUOTE(IGUI_GRID_STANCE_HAbs / 4); }; class GVAR(stateIndicator1): RscPictureKeepAspect { onLoad = QUOTE(uiNamespace setVariable [ARR_2(QQGVAR(stateIndicator1), _this select 0)]); - x = IGUI_GRID_STANCE_X + IGUI_GRID_STANCE_WAbs * 3 / 4; - y = IGUI_GRID_STANCE_Y; - w = IGUI_GRID_STANCE_WAbs / 4; - h = IGUI_GRID_STANCE_HAbs / 4; + x = QUOTE(ace_IGUI_GRID_STANCE_X + IGUI_GRID_STANCE_WAbs * 3 / 4); + y = QUOTE(ace_IGUI_GRID_STANCE_Y); + w = QUOTE(IGUI_GRID_STANCE_WAbs / 4); + h = QUOTE(IGUI_GRID_STANCE_HAbs / 4); }; class GVAR(stateIndicator2): GVAR(stateIndicator1) { onLoad = QUOTE(uiNamespace setVariable [ARR_2(QQGVAR(stateIndicator2), _this select 0)]); - y = IGUI_GRID_STANCE_Y + IGUI_GRID_STANCE_HAbs / 4; + y = QUOTE(ace_IGUI_GRID_STANCE_Y + IGUI_GRID_STANCE_HAbs / 4); }; class GVAR(stateIndicator3): GVAR(stateIndicator1) { onLoad = QUOTE(uiNamespace setVariable [ARR_2(QQGVAR(stateIndicator3), _this select 0)]); - y = IGUI_GRID_STANCE_Y + IGUI_GRID_STANCE_HAbs * 2 / 4; + y = QUOTE(ace_IGUI_GRID_STANCE_Y + IGUI_GRID_STANCE_HAbs * 2 / 4); }; }; }; diff --git a/addons/medical_gui/CfgUIGrids.hpp b/addons/medical_gui/CfgUIGrids.hpp index b0835fe709..1a7716503f 100644 --- a/addons/medical_gui/CfgUIGrids.hpp +++ b/addons/medical_gui/CfgUIGrids.hpp @@ -5,13 +5,13 @@ class CfgUIGrids { class Variables { GVAR(patientInfo)[] = { { - PATIENT_INFO_IGUI_BASE_X, - PATIENT_INFO_IGUI_BASE_Y, - POS_W(9), - POS_H(20) + QUOTE(PATIENT_INFO_IGUI_BASE_X), + QUOTE(PATIENT_INFO_IGUI_BASE_Y), + QUOTE(POS_W(9)), + QUOTE(POS_H(20)) }, - GUI_GRID_W, - GUI_GRID_H + QUOTE(GUI_GRID_W), + QUOTE(GUI_GRID_H) }; }; }; diff --git a/addons/medical_gui/gui.hpp b/addons/medical_gui/gui.hpp index 6aa6c7d354..ef6674137d 100644 --- a/addons/medical_gui/gui.hpp +++ b/addons/medical_gui/gui.hpp @@ -8,18 +8,18 @@ class RscControlsGroupNoScrollbars; class GVAR(BodyImage): RscControlsGroupNoScrollbars { idc = IDC_BODY_GROUP; - x = POS_X(13.33); - y = POS_Y(2.73); - w = POS_W(12.33); - h = POS_H(12.33); + x = QUOTE(POS_X(13.33)); + y = QUOTE(POS_Y(2.73)); + w = QUOTE(POS_W(12.33)); + h = QUOTE(POS_H(12.33)); class controls { class Background: RscPicture { idc = -1; text = QPATHTOF(data\body_image\background.paa); x = 0; y = 0; - w = POS_W(12.33); - h = POS_H(12.33); + w = QUOTE(POS_W(12.33)); + h = QUOTE(POS_H(12.33)); }; class Head: Background { idc = IDC_BODY_HEAD; @@ -87,10 +87,10 @@ class GVAR(BodyImage): RscControlsGroupNoScrollbars { class GVAR(TriageToggle): RscButton { idc = -1; onButtonClick = QUOTE([ctrlParent (_this select 0)] call FUNC(toggleTriageSelect)); - x = POS_X(13.33); - y = POS_Y(15.5); - w = POS_W(12.33); - h = POS_H(1.1); + x = QUOTE(POS_X(13.33)); + y = QUOTE(POS_Y(15.5)); + w = QUOTE(POS_W(12.33)); + h = QUOTE(POS_H(1.1)); colorFocused[] = {0, 0, 0, 0}; colorBackground[] = {0, 0, 0, 0}; colorBackgroundActive[] = {0, 0, 0, 0}; @@ -98,10 +98,10 @@ class GVAR(TriageToggle): RscButton { class GVAR(TriageSelect): RscControlsGroupNoScrollbars { idc = IDC_TRIAGE_SELECT; - x = POS_X(13.33); - y = POS_Y(16.6); - w = POS_W(12.33); - h = POS_H(5.5); + x = QUOTE(POS_X(13.33)); + y = QUOTE(POS_Y(16.6)); + w = QUOTE(POS_W(12.33)); + h = QUOTE(POS_H(5.5)); class controls { class None: RscButton { idc = -1; @@ -110,8 +110,8 @@ class GVAR(TriageSelect): RscControlsGroupNoScrollbars { text = ECSTRING(medical_treatment,Triage_Status_None); x = 0; y = 0; - w = POS_W(12.33); - h = POS_H(1.1); + w = QUOTE(POS_W(12.33)); + h = QUOTE(POS_H(1.1)); shadow = 0; colorText[] = {TRIAGE_TEXT_COLOR_NONE}; colorFocused[] = {TRIAGE_COLOR_NONE}; @@ -121,7 +121,7 @@ class GVAR(TriageSelect): RscControlsGroupNoScrollbars { class Minimal: None { onButtonClick = QUOTE([ARR_3(ctrlParent (_this select 0),GVAR(target),1)] call FUNC(handleTriageSelect)); text = ECSTRING(medical_treatment,Triage_Status_Minimal); - y = POS_H(1.1); + y = QUOTE(POS_H(1.1)); colorText[] = {TRIAGE_TEXT_COLOR_MINIMAL}; colorFocused[] = {TRIAGE_COLOR_MINIMAL}; colorBackground[] = {TRIAGE_COLOR_MINIMAL}; @@ -130,7 +130,7 @@ class GVAR(TriageSelect): RscControlsGroupNoScrollbars { class Delayed: None { onButtonClick = QUOTE([ARR_3(ctrlParent (_this select 0),GVAR(target),2)] call FUNC(handleTriageSelect)); text = ECSTRING(medical_treatment,Triage_Status_Delayed); - y = POS_H(2.2); + y = QUOTE(POS_H(2.2)); colorText[] = {TRIAGE_TEXT_COLOR_DELAYED}; colorFocused[] = {TRIAGE_COLOR_DELAYED}; colorBackground[] = {TRIAGE_COLOR_DELAYED}; @@ -139,7 +139,7 @@ class GVAR(TriageSelect): RscControlsGroupNoScrollbars { class Immediate: None { onButtonClick = QUOTE([ARR_3(ctrlParent (_this select 0),GVAR(target),3)] call FUNC(handleTriageSelect)); text = ECSTRING(medical_treatment,Triage_Status_Immediate); - y = POS_H(3.3); + y = QUOTE(POS_H(3.3)); colorText[] = {TRIAGE_TEXT_COLOR_IMMEDIATE}; colorFocused[] = {TRIAGE_COLOR_IMMEDIATE}; colorBackground[] = {TRIAGE_COLOR_IMMEDIATE}; @@ -148,7 +148,7 @@ class GVAR(TriageSelect): RscControlsGroupNoScrollbars { class Deceased: None { onButtonClick = QUOTE([ARR_3(ctrlParent (_this select 0),GVAR(target),4)] call FUNC(handleTriageSelect)); text = ECSTRING(medical_treatment,Triage_Status_Deceased); - y = POS_H(4.4); + y = QUOTE(POS_H(4.4)); colorText[] = {TRIAGE_TEXT_COLOR_DECEASED}; colorFocused[] = {TRIAGE_COLOR_DECEASED}; colorBackground[] = {TRIAGE_COLOR_DECEASED}; @@ -166,24 +166,24 @@ class ACE_Medical_Menu { class controlsBackground { class Title: RscText { idc = IDC_TITLE; - x = POS_X(1); - y = POS_Y(0); - w = POS_W(38); - h = POS_H(1); + x = QUOTE(POS_X(1)); + y = QUOTE(POS_Y(0)); + w = QUOTE(POS_W(38)); + h = QUOTE(POS_H(1)); colorBackground[] = GUI_BCG_COLOR; moving = 1; }; class Center: RscText { idc = -1; - x = POS_X(1); - y = POS_Y(1.1); - w = POS_W(38); - h = POS_H(16); + x = QUOTE(POS_X(1)); + y = QUOTE(POS_Y(1.1)); + w = QUOTE(POS_W(38)); + h = QUOTE(POS_H(16)); colorBackground[] = {0, 0, 0, 0.7}; }; class Bottom: Center { - y = POS_Y(17.6); - h = POS_H(9); + y = QUOTE(POS_Y(17.6)); + h = QUOTE(POS_H(9)); }; }; class controls { @@ -191,27 +191,27 @@ class ACE_Medical_Menu { idc = -1; style = ST_CENTER; text = CSTRING(EXAMINE_TREATMENT); - x = POS_X(1); - y = POS_Y(1.5); - w = POS_W(12.33); - h = POS_H(1); - sizeEx = POS_H(1.2); + x = QUOTE(POS_X(1)); + y = QUOTE(POS_Y(1.5)); + w = QUOTE(POS_W(12.33)); + h = QUOTE(POS_H(1)); + sizeEx = QUOTE(POS_H(1.2)); colorText[] = {1, 1, 1, 0.9}; }; class StatusHeader: TreatmentHeader { text = CSTRING(STATUS); - x = POS_X(13.33); + x = QUOTE(POS_X(13.33)); }; class OverviewHeader: TreatmentHeader { text = CSTRING(OVERVIEW); - x = POS_X(25.66); + x = QUOTE(POS_X(25.66)); }; class HeaderLine: RscText { idc = -1; - x = POS_X(1.5); - y = POS_Y(2.6); - w = POS_W(37); - h = POS_H(0.03); + x = QUOTE(POS_X(1.5)); + y = QUOTE(POS_Y(2.6)); + w = QUOTE(POS_W(37)); + h = QUOTE(POS_H(0.03)); colorBackground[] = {1, 1, 1, 0.5}; }; class Triage: RscActivePicture { @@ -219,10 +219,10 @@ class ACE_Medical_Menu { onButtonClick = QUOTE(GVAR(selectedCategory) = 'triage'); text = QPATHTOF(data\categories\triage_card.paa); tooltip = CSTRING(ViewTriageCard); - x = POS_X(1.5); - y = POS_Y(2.73); - w = POS_W(1.5); - h = POS_H(1.5); + x = QUOTE(POS_X(1.5)); + y = QUOTE(POS_Y(2.73)); + w = QUOTE(POS_W(1.5)); + h = QUOTE(POS_H(1.5)); color[] = {1, 1, 1, 1}; soundClick[] = {"\a3\ui_f\data\sound\rscbutton\soundClick", 0.09, 1}; soundEnter[] = {"\a3\ui_f\data\sound\rscbutton\soundEnter", 0.09, 1}; @@ -234,57 +234,57 @@ class ACE_Medical_Menu { onButtonClick = QUOTE(GVAR(selectedCategory) = 'examine'); text = QPATHTOF(data\categories\examine_patient.paa); tooltip = CSTRING(ExaminePatient); - x = POS_X(3); + x = QUOTE(POS_X(3)); }; class Bandage: Triage { idc = IDC_BANDAGE; onButtonClick = QUOTE(GVAR(selectedCategory) = 'bandage'); text = QPATHTOF(data\categories\bandage_fracture.paa); tooltip = CSTRING(BandageFractures); - x = POS_X(4.5); + x = QUOTE(POS_X(4.5)); }; class Medication: Triage { idc = IDC_MEDICATION; onButtonClick = QUOTE(GVAR(selectedCategory) = 'medication'); text = QPATHTOF(data\categories\medication.paa); tooltip = CSTRING(Medication); - x = POS_X(6); + x = QUOTE(POS_X(6)); }; class Airway: Triage { idc = IDC_AIRWAY; onButtonClick = QUOTE(GVAR(selectedCategory) = 'airway'); text = QPATHTOF(data\categories\airway_management.paa); tooltip = CSTRING(AirwayManagement); - x = POS_X(7.5); + x = QUOTE(POS_X(7.5)); }; class Advanced: Triage { idc = IDC_ADVANCED; onButtonClick = QUOTE(GVAR(selectedCategory) = 'advanced'); text = QPATHTOF(data\categories\advanced_treatment.paa); tooltip = CSTRING(AdvancedTreatment); - x = POS_X(9); + x = QUOTE(POS_X(9)); }; class Drag: Triage { idc = IDC_DRAG; onButtonClick = QUOTE(GVAR(selectedCategory) = 'drag'); text = QPATHTOF(data\categories\carry.paa); tooltip = CSTRING(DragCarry); - x = POS_X(10.5); + x = QUOTE(POS_X(10.5)); }; class Toggle: Triage { idc = IDC_TOGGLE; onButtonClick = QUOTE(call FUNC(handleToggle)); text = QPATHTOF(data\categories\toggle_self.paa); tooltip = CSTRING(ToggleSelf); - x = POS_X(12); + x = QUOTE(POS_X(12)); }; class TriageCard: RscListBox { idc = IDC_TRIAGE_CARD; - x = POS_X(1.5); - y = POS_Y(4.4); - w = POS_W(12); - h = POS_H(10); - sizeEx = POS_H(0.7); + x = QUOTE(POS_X(1.5)); + y = QUOTE(POS_Y(4.4)); + w = QUOTE(POS_W(12)); + h = QUOTE(POS_H(10)); + sizeEx = QUOTE(POS_H(0.7)); colorSelect[] = {1, 1, 1, 1}; colorSelect2[] = {1, 1, 1, 1}; colorBackground[] = {0, 0, 0, 0.2}; @@ -295,11 +295,11 @@ class ACE_Medical_Menu { class Action1: RscButtonMenu { idc = IDC_ACTION_1; style = ST_LEFT; - x = POS_X(1.5); - y = POS_Y(4.4); - w = POS_W(12); - h = POS_H(1); - size = POS_H(0.9); + x = QUOTE(POS_X(1.5)); + y = QUOTE(POS_Y(4.4)); + w = QUOTE(POS_W(12)); + h = QUOTE(POS_H(1)); + size = QUOTE(POS_H(0.9)); class Attributes { align = "center"; color = "#E5E5E5"; @@ -309,45 +309,45 @@ class ACE_Medical_Menu { }; class Action2: Action1 { idc = IDC_ACTION_2; - y = POS_Y(5.5); + y = QUOTE(POS_Y(5.5)); }; class Action3: Action1 { idc = IDC_ACTION_3; - y = POS_Y(6.6); + y = QUOTE(POS_Y(6.6)); }; class Action4: Action1 { idc = IDC_ACTION_4; - y = POS_Y(7.7); + y = QUOTE(POS_Y(7.7)); }; class Action5: Action1 { idc = IDC_ACTION_5; - y = POS_Y(8.8); + y = QUOTE(POS_Y(8.8)); }; class Action6: Action1 { idc = IDC_ACTION_6; - y = POS_Y(9.9); + y = QUOTE(POS_Y(9.9)); }; class Action7: Action1 { idc = IDC_ACTION_7; - y = POS_Y(11); + y = QUOTE(POS_Y(11)); }; class Action8: Action1 { idc = IDC_ACTION_8; - y = POS_Y(12.1); + y = QUOTE(POS_Y(12.1)); }; class Action9: Action1 { idc = IDC_ACTION_9; - y = POS_Y(13.2); + y = QUOTE(POS_Y(13.2)); }; class BodyImage: GVAR(BodyImage) {}; class SelectHead: RscButton { idc = -1; onButtonClick = QUOTE(GVAR(selectedBodyPart) = 0); tooltip = CSTRING(SelectHead); - x = POS_X(18.8); - y = POS_Y(3.2); - w = POS_W(1.4); - h = POS_H(1.8); + x = QUOTE(POS_X(18.8)); + y = QUOTE(POS_Y(3.2)); + w = QUOTE(POS_W(1.4)); + h = QUOTE(POS_H(1.8)); colorFocused[] = {0, 0, 0, 0}; colorBackground[] = {0, 0, 0, 0}; colorBackgroundActive[] = {0, 0, 0, 0}; @@ -355,75 +355,75 @@ class ACE_Medical_Menu { class SelectTorso: SelectHead { onButtonClick = QUOTE(GVAR(selectedBodyPart) = 1); tooltip = CSTRING(SelectTorso); - x = POS_X(18.4); - y = POS_Y(5); - w = POS_W(2.2); - h = POS_H(3.8); + x = QUOTE(POS_X(18.4)); + y = QUOTE(POS_Y(5)); + w = QUOTE(POS_W(2.2)); + h = QUOTE(POS_H(3.8)); }; class SelectArmLeft: SelectHead { onButtonClick = QUOTE(GVAR(selectedBodyPart) = 2); tooltip = CSTRING(SelectLeftArm); - x = POS_X(20.6); - y = POS_Y(5.1); - w = POS_W(1.1); - h = POS_H(4.6); + x = QUOTE(POS_X(20.6)); + y = QUOTE(POS_Y(5.1)); + w = QUOTE(POS_W(1.1)); + h = QUOTE(POS_H(4.6)); }; class SelectArmRight: SelectArmLeft { onButtonClick = QUOTE(GVAR(selectedBodyPart) = 3); tooltip = CSTRING(SelectRightArm); - x = POS_X(17.4); + x = QUOTE(POS_X(17.4)); }; class SelectLegLeft: SelectHead { onButtonClick = QUOTE(GVAR(selectedBodyPart) = 4); tooltip = CSTRING(SelectLeftLeg); - x = POS_X(19.5); - y = POS_Y(8.8); - w = POS_W(1.1); - h = POS_H(5.8); + x = QUOTE(POS_X(19.5)); + y = QUOTE(POS_Y(8.8)); + w = QUOTE(POS_W(1.1)); + h = QUOTE(POS_H(5.8)); }; class SelectLegRight: SelectLegLeft { onButtonClick = QUOTE(GVAR(selectedBodyPart) = 5); tooltip = CSTRING(SelectRightLeg); - x = POS_X(18.4); + x = QUOTE(POS_X(18.4)); }; class Injuries: TriageCard { idc = IDC_INJURIES; - x = POS_X(25.66); - w = POS_W(12.33); + x = QUOTE(POS_X(25.66)); + w = QUOTE(POS_W(12.33)); }; class ActivityHeader: TreatmentHeader { text = CSTRING(ACTIVITY_LOG); - y = POS_Y(17.6); - w = POS_W(18.5); - sizeEx = POS_H(1); + y = QUOTE(POS_Y(17.6)); + w = QUOTE(POS_W(18.5)); + sizeEx = QUOTE(POS_H(1)); colorText[] = {0.6, 0.7, 1, 1}; }; class QuickViewHeader: ActivityHeader { text = CSTRING(QUICK_VIEW); - x = POS_X(19.5); + x = QUOTE(POS_X(19.5)); }; class LowerLine: HeaderLine { - y = POS_Y(18.5); + y = QUOTE(POS_Y(18.5)); }; class Activity: Injuries { idc = IDC_ACTIVITY; - x = POS_X(1.5); - y = POS_Y(18.5); - w = POS_W(18.5); - h = POS_H(6.5); + x = QUOTE(POS_X(1.5)); + y = QUOTE(POS_Y(18.5)); + w = QUOTE(POS_W(18.5)); + h = QUOTE(POS_H(6.5)); colorBackground[] = {0, 0, 0, 0}; }; class QuickView: Activity { idc = IDC_QUICKVIEW; - x = POS_X(21.5); + x = QUOTE(POS_X(21.5)); }; class TriageStatus: RscText { idc = IDC_TRIAGE_STATUS; style = ST_CENTER; - x = POS_X(13.33); - y = POS_Y(15.5); - w = POS_W(12.33); - h = POS_H(1.1); + x = QUOTE(POS_X(13.33)); + y = QUOTE(POS_Y(15.5)); + w = QUOTE(POS_W(12.33)); + h = QUOTE(POS_H(1.1)); shadow = 0; }; class TriageToggle: GVAR(TriageToggle) {}; @@ -438,45 +438,45 @@ class GVAR(RscTriageCard) { class controls { class Background: RscText { idc = -1; - x = POS_X(12.5); - y = POS_Y(0); - w = POS_W(15); - h = POS_H(19); + x = QUOTE(POS_X(12.5)); + y = QUOTE(POS_Y(0)); + w = QUOTE(POS_W(15)); + h = QUOTE(POS_H(19)); colorBackground[] = {1, 1, 1, 1}; moving = 1; }; class CornerLeft: RscPicture { idc = -1; text = QPATHTOF(data\triage_card\corner_left.paa); - x = POS_X(12.5); - y = POS_Y(0); - w = POS_W(5); - h = POS_H(5); + x = QUOTE(POS_X(12.5)); + y = QUOTE(POS_Y(0)); + w = QUOTE(POS_W(5)); + h = QUOTE(POS_H(5)); colorText[] = {1, 1, 0, 1}; }; class CornerRight: CornerLeft { text = QPATHTOF(data\triage_card\corner_right.paa); - x = POS_X(22.5); + x = QUOTE(POS_X(22.5)); }; class Title: RscText { idc = -1; style = ST_CENTER; text = CSTRING(Actions_TriageCard); - x = POS_X(12.5); - y = POS_Y(3); - w = POS_W(15); - h = POS_H(0.9); - sizeEx = POS_H(0.9); + x = QUOTE(POS_X(12.5)); + y = QUOTE(POS_Y(3)); + w = QUOTE(POS_W(15)); + h = QUOTE(POS_H(0.9)); + sizeEx = QUOTE(POS_H(0.9)); shadow = 0; colorText[] = {0, 0, 0, 1}; }; class TriageCard: RscListBox { idc = IDC_TRIAGE_CARD; - x = POS_X(13.5); - y = POS_Y(5); - w = POS_W(13); - h = POS_H(13); - sizeEx = POS_H(0.7); + x = QUOTE(POS_X(13.5)); + y = QUOTE(POS_Y(5)); + w = QUOTE(POS_W(13)); + h = QUOTE(POS_H(13)); + sizeEx = QUOTE(POS_H(0.7)); colorText[] = {0, 0, 0, 1}; colorSelect[] = {0, 0, 0, 1}; colorSelect2[] = {0, 0, 0, 1}; @@ -488,36 +488,36 @@ class GVAR(RscTriageCard) { class TriageStatus: RscText { idc = IDC_TRIAGE_STATUS; style = ST_CENTER; - x = POS_X(12.5); - y = POS_Y(19); - w = POS_W(15); - h = POS_H(1.1); + x = QUOTE(POS_X(12.5)); + y = QUOTE(POS_Y(19)); + w = QUOTE(POS_W(15)); + h = QUOTE(POS_H(1.1)); shadow = 0; }; class TriageToggle: GVAR(TriageToggle) { - x = POS_X(12.5); - y = POS_Y(19); - w = POS_W(15); + x = QUOTE(POS_X(12.5)); + y = QUOTE(POS_Y(19)); + w = QUOTE(POS_W(15)); }; class TriageSelect: GVAR(TriageSelect) { - x = POS_X(12.5); - y = POS_Y(20); - w = POS_W(15); + x = QUOTE(POS_X(12.5)); + y = QUOTE(POS_Y(20)); + w = QUOTE(POS_W(15)); class controls: controls { class None: None { - w = POS_W(15); + w = QUOTE(POS_W(15)); }; class Minimal: Minimal { - w = POS_W(15); + w = QUOTE(POS_W(15)); }; class Delayed: Delayed { - w = POS_W(15); + w = QUOTE(POS_W(15)); }; class Immediate: Immediate { - w = POS_W(15); + w = QUOTE(POS_W(15)); }; class Deceased: Deceased { - w = POS_W(15); + w = QUOTE(POS_W(15)); }; }; }; @@ -535,96 +535,96 @@ class RscTitles { class controls { class PatientInfoContainer: RscControlsGroupNoScrollbars { idc = -1; - x = safeZoneX + PATIENT_INFO_IGUI_OFFSET_X; - y = safeZoneY + PATIENT_INFO_IGUI_OFFSET_Y; - w = safeZoneW; - h = safeZoneH; + x = QUOTE(safeZoneX + PATIENT_INFO_IGUI_OFFSET_X); + y = QUOTE(safeZoneY + PATIENT_INFO_IGUI_OFFSET_Y); + w = "safeZoneW"; + h = "safeZoneH"; class controls { class BodyImage: GVAR(BodyImage) { - x = POS_W(2.25); - y = POS_H(1.5); - w = POS_W(8.5); - h = POS_H(8.5); + x = QUOTE(POS_W(2.25)); + y = QUOTE(POS_H(1.5)); + w = QUOTE(POS_W(8.5)); + h = QUOTE(POS_H(8.5)); class controls: controls { class Background: Background { - w = POS_W(8.5); - h = POS_H(8.5); + w = QUOTE(POS_W(8.5)); + h = QUOTE(POS_H(8.5)); }; class Head: Head { - w = POS_W(8.5); - h = POS_H(8.5); + w = QUOTE(POS_W(8.5)); + h = QUOTE(POS_H(8.5)); }; class Torso: Torso { - w = POS_W(8.5); - h = POS_H(8.5); + w = QUOTE(POS_W(8.5)); + h = QUOTE(POS_H(8.5)); }; class ArmLeft: ArmLeft { - w = POS_W(8.5); - h = POS_H(8.5); + w = QUOTE(POS_W(8.5)); + h = QUOTE(POS_H(8.5)); }; class ArmRight: ArmRight { - w = POS_W(8.5); - h = POS_H(8.5); + w = QUOTE(POS_W(8.5)); + h = QUOTE(POS_H(8.5)); }; class LegLeft: LegLeft { - w = POS_W(8.5); - h = POS_H(8.5); + w = QUOTE(POS_W(8.5)); + h = QUOTE(POS_H(8.5)); }; class LegRight: LegRight { - w = POS_W(8.5); - h = POS_H(8.5); + w = QUOTE(POS_W(8.5)); + h = QUOTE(POS_H(8.5)); }; class ArmLeftB: ArmLeftB { - w = POS_W(8.5); - h = POS_H(8.5); + w = QUOTE(POS_W(8.5)); + h = QUOTE(POS_H(8.5)); }; class ArmRightB: ArmRightB { - w = POS_W(8.5); - h = POS_H(8.5); + w = QUOTE(POS_W(8.5)); + h = QUOTE(POS_H(8.5)); }; class LegLeftB: LegLeftB { - w = POS_W(8.5); - h = POS_H(8.5); + w = QUOTE(POS_W(8.5)); + h = QUOTE(POS_H(8.5)); }; class LegRightB: LegRightB { - w = POS_W(8.5); - h = POS_H(8.5); + w = QUOTE(POS_W(8.5)); + h = QUOTE(POS_H(8.5)); }; class ArmLeftT: ArmLeftT { - w = POS_W(8.5); - h = POS_H(8.5); + w = QUOTE(POS_W(8.5)); + h = QUOTE(POS_H(8.5)); }; class ArmRightT: ArmRightT { - w = POS_W(8.5); - h = POS_H(8.5); + w = QUOTE(POS_W(8.5)); + h = QUOTE(POS_H(8.5)); }; class LegLeftT: LegLeftT { - w = POS_W(8.5); - h = POS_H(8.5); + w = QUOTE(POS_W(8.5)); + h = QUOTE(POS_H(8.5)); }; class LegRightT: LegRightT { - w = POS_W(8.5); - h = POS_H(8.5); + w = QUOTE(POS_W(8.5)); + h = QUOTE(POS_H(8.5)); }; }; }; class InjuriesLabel: RscText { idc = -1; text = CSTRING(INJURIES); - x = POS_W(2); - y = POS_H(10.2); - w = POS_W(9); - h = POS_H(0.7); - sizeEx = POS_H(0.7); + x = QUOTE(POS_W(2)); + y = QUOTE(POS_H(10.2)); + w = QUOTE(POS_W(9)); + h = QUOTE(POS_H(0.7)); + sizeEx = QUOTE(POS_H(0.7)); colorBackground[] = GUI_BCG_COLOR; }; class Injuries: RscListBox { idc = IDC_INJURIES; - x = POS_W(2); - y = POS_H(11); - w = POS_W(9); - h = POS_H(9); - sizeEx = POS_H(0.7); + x = QUOTE(POS_W(2)); + y = QUOTE(POS_H(11)); + w = QUOTE(POS_W(9)); + h = QUOTE(POS_H(9)); + sizeEx = QUOTE(POS_H(0.7)); colorSelect[] = {1, 1, 1, 1}; colorSelect2[] = {1, 1, 1, 1}; colorBackground[] = {0, 0, 0, 0.2}; @@ -634,19 +634,19 @@ class RscTitles { }; class TriageStatus: RscText { idc = IDC_TRIAGE_STATUS; - x = POS_W(2); - y = POS_H(20.2); - w = POS_W(9); - h = POS_H(0.7); - sizeEx = POS_H(0.7); + x = QUOTE(POS_W(2)); + y = QUOTE(POS_H(20.2)); + w = QUOTE(POS_W(9)); + h = QUOTE(POS_H(0.7)); + sizeEx = QUOTE(POS_H(0.7)); shadow = 0; }; class Activity: Injuries { idc = IDC_ACTIVITY; - x = POS_W(1.75); - y = POS_H(21); - w = POS_W(15); - h = POS_H(7); + x = QUOTE(POS_W(1.75)); + y = QUOTE(POS_H(21)); + w = QUOTE(POS_W(15)); + h = QUOTE(POS_H(7)); shadow = 2; colorBackground[] = {0, 0, 0, 0}; }; diff --git a/addons/medical_treatment/Cfg3DEN.hpp b/addons/medical_treatment/Cfg3DEN.hpp index 04c3fc3efd..0df2b498e6 100644 --- a/addons/medical_treatment/Cfg3DEN.hpp +++ b/addons/medical_treatment/Cfg3DEN.hpp @@ -23,9 +23,9 @@ class Cfg3DEN { class Title: Title {}; class Value: ctrlToolbox { idc = 100; - x = 48 * GRID_3DEN_W; - w = 82 * GRID_3DEN_W; - h = 5 * GRID_3DEN_H; + x = QUOTE(48 * GRID_3DEN_W); + w = QUOTE(82 * GRID_3DEN_W); + h = QUOTE(5 * GRID_3DEN_H); rows = 1; columns = 4; strings[] = { diff --git a/addons/mx2a/CfgWeapons.hpp b/addons/mx2a/CfgWeapons.hpp index 7ff5943a88..66f775c2d8 100644 --- a/addons/mx2a/CfgWeapons.hpp +++ b/addons/mx2a/CfgWeapons.hpp @@ -15,7 +15,7 @@ class CfgWeapons { opticsZoomInit = 0.1; visionMode[] = {"Ti"}; thermalMode[] = {0,1}; - discretefov[] = {0.33333/1, 0.33333/2}; // 1x/2x -- http://www.drs.com/Products/RSTA/PDF/MX2A.pdf + discretefov[] = {"0.33333/1", "0.33333/2"}; // 1x/2x -- http://www.drs.com/Products/RSTA/PDF/MX2A.pdf discreteInitIndex = 0; discreteDistance[] = {120,400}; discreteDistanceInitIndex = 1; diff --git a/addons/nametags/RscTitles.hpp b/addons/nametags/RscTitles.hpp index f0d5678603..0fad69070d 100644 --- a/addons/nametags/RscTitles.hpp +++ b/addons/nametags/RscTitles.hpp @@ -20,8 +20,8 @@ class RscTitles { idc = ACE_CrewInfo_TextIDC; type = CT_STRUCTURED_TEXT; style = ST_LEFT; - x = SafeZonex + SafezoneW - 0.31; - y = SafeZoneY + SafeZoneH * 0.4; + x = "SafeZonex + SafezoneW - 0.31"; + y = "SafeZoneY + SafeZoneH * 0.4"; w = 0.3; h = 0.6; size = 0.018; @@ -34,7 +34,7 @@ class RscTitles { }; text = ""; class Attributes { - align = right; + align = "right"; }; }; }; diff --git a/addons/optics/CfgRscTitles.hpp b/addons/optics/CfgRscTitles.hpp index 3df4632e16..bb01281a22 100644 --- a/addons/optics/CfgRscTitles.hpp +++ b/addons/optics/CfgRscTitles.hpp @@ -68,10 +68,10 @@ class RscInGameUI { text = ""; colorText[] = {1, 1, 1, 0}; colorBackground[] = {0, 0, 0, 0}; - x = safezoneX + 0.5 * safezoneW - 0.5 * SIZEX; - y = safezoneY + 0.5 * safezoneH - 0.5 * SIZEX * (4 / 3); - w = SIZEX; - h = SIZEX * (4 / 3); + x = QUOTE(safezoneX + 0.5 * safezoneW - 0.5 * SIZEX); + y = QUOTE(safezoneY + 0.5 * safezoneH - 0.5 * SIZEX * (4 / 3)); + w = QUOTE(SIZEX); + h = QUOTE(SIZEX * (4 / 3)); }; class ReticleNight: ReticleDay { @@ -84,10 +84,10 @@ class RscInGameUI { class BodyDay: ReticleDay { idc = 1713005; text = ""; - x = safezoneX + 0.5 * safezoneW - 0.5 * SIZEX; - y = safezoneY + 0.5 * safezoneH - 0.5 * SIZEX * (4 / 3); - w = SIZEX; - h = SIZEX * (4 / 3); + x = QUOTE(safezoneX + 0.5 * safezoneW - 0.5 * SIZEX); + y = QUOTE(safezoneY + 0.5 * safezoneH - 0.5 * SIZEX * (4 / 3)); + w = QUOTE(SIZEX); + h = QUOTE(SIZEX * (4 / 3)); }; class BodyNight: BodyDay { @@ -109,7 +109,7 @@ class RscInGameUI { class trippleHeadRight: trippleHeadLeft { idc = 1713011; x = "safeZoneXAbs + safeZoneWAbs - (safezoneX - safeZoneXABS) * ((getResolution select 4) / (16 / 3))"; - colorBackground[] = {0, 0, 0, 1}; + colorBackground[] = {0, 0, 0, 1}; }; }; diff --git a/addons/parachute/RscTitles.hpp b/addons/parachute/RscTitles.hpp index 277db4d2f9..9e0a169937 100644 --- a/addons/parachute/RscTitles.hpp +++ b/addons/parachute/RscTitles.hpp @@ -13,37 +13,37 @@ class RscTitles { class AltimeterImage: RscPicture { idc = 1200; text = QPATHTOF(UI\watch_altimeter.paa); - x = 0.118437 * safezoneW + safezoneX; - y = 0.621 * safezoneH + safezoneY; - w = 0.20625 * safezoneW; - h = 0.341 * safezoneH; + x = "0.118437 * safezoneW + safezoneX"; + y = "0.621 * safezoneH + safezoneY"; + w = "0.20625 * safezoneW"; + h = "0.341 * safezoneH"; }; class HeightText: RscText { idc = 1100; text = "----"; - x = 0.200937 * safezoneW + safezoneX; - y = 0.764 * safezoneH + safezoneY; - w = 0.04125 * safezoneW; - h = 0.033 * safezoneH; + x = "0.200937 * safezoneW + safezoneX"; + y = "0.764 * safezoneH + safezoneY"; + w = "0.04125 * safezoneW"; + h = "0.033 * safezoneH"; colorBackground[] = {0,0,0,0}; colorText[] = {0,0,0,1}; }; class DecendRate: RscText { idc = 1000; text = "--"; - x = 0.21125 * safezoneW + safezoneX; - y = 0.742 * safezoneH + safezoneY; - w = 0.020625 * safezoneW; - h = 0.022 * safezoneH; + x = "0.21125 * safezoneW + safezoneX"; + y = "0.742 * safezoneH + safezoneY"; + w = "0.020625 * safezoneW"; + h = "0.022 * safezoneH"; colorText[] = {0,0,0,1}; }; class TimeText: RscText { idc = 1001; text = "00:00"; - x = 0.206094 * safezoneW + safezoneX; - y = 0.819 * safezoneH + safezoneY; - w = 0.0309375 * safezoneW; - h = 0.022 * safezoneH; + x = "0.206094 * safezoneW + safezoneX"; + y = "0.819 * safezoneH + safezoneY"; + w = "0.0309375 * safezoneW"; + h = "0.022 * safezoneH"; colorText[] = {0,0,0,1}; }; }; diff --git a/addons/pylons/menu.hpp b/addons/pylons/menu.hpp index 85ca6b1c95..143792e566 100644 --- a/addons/pylons/menu.hpp +++ b/addons/pylons/menu.hpp @@ -23,143 +23,143 @@ class GVAR(DialogLoadout) { class TextTitlebar: RscText { idc = ID_TEXT_TITLEBAR; text = CSTRING(AircraftLoadoutTitle); - x = 0.15835 * safezoneW + safezoneX; - y = 0.262 * safezoneH + safezoneY; - w = 0.68304 * safezoneW; - h = 0.028 * safezoneH; + x = "0.15835 * safezoneW + safezoneX"; + y = "0.262 * safezoneH + safezoneY"; + w = "0.68304 * safezoneW"; + h = "0.028 * safezoneH"; colorBackground[] = {"(profileNamespace getVariable ['GUI_BCG_RGB_R', 0.13])","(profileNamespace getVariable ['GUI_BCG_RGB_G', 0.54])","(profileNamespace getVariable ['GUI_BCG_RGB_B', 0.21])",1}; }; class BackgroundDialog: IGUIBack { idc = ID_BACKGROUND_DIALOG; - x = 0.15835 * safezoneW + safezoneX; - y = 0.29 * safezoneH + safezoneY; - w = 0.68304 * safezoneW; - h = 0.448 * safezoneH; + x = "0.15835 * safezoneW + safezoneX"; + y = "0.29 * safezoneH + safezoneY"; + w = "0.68304 * safezoneW"; + h = "0.448 * safezoneH"; colorBackground[] = {0,0,0,0.3}; }; class BackgroundPicture: IGUIBack { idc = ID_BACKGROUND_PICTURE; - x = 0.171616 * safezoneW + safezoneX; - y = 0.318 * safezoneH + safezoneY; - w = 0.440035 * safezoneW; - h = 0.392 * safezoneH; + x = "0.171616 * safezoneW + safezoneX"; + y = "0.318 * safezoneH + safezoneY"; + w = "0.440035 * safezoneW"; + h = "0.392 * safezoneH"; colorBackground[] = {0.3,0.3,0.3,1}; }; class PictureAircraft: RscPictureKeepAspect { idc = ID_PICTURE_AIRCRAFT; - x = 0.171616 * safezoneW + safezoneX; - y = 0.318 * safezoneH + safezoneY; - w = 0.440035 * safezoneW; - h = 0.392 * safezoneH; + x = "0.171616 * safezoneW + safezoneX"; + y = "0.318 * safezoneH + safezoneY"; + w = "0.440035 * safezoneW"; + h = "0.392 * safezoneH"; }; class CheckboxMirror: RscCheckBox { idc = ID_CHECKBOX_MIRROR; - x = 0.171616 * safezoneW + safezoneX; - y = 0.318 * safezoneH + safezoneY; - w = 0.0165 * safezoneW; - h = 0.028 * safezoneH; + x = "0.171616 * safezoneW + safezoneX"; + y = "0.318 * safezoneH + safezoneY"; + w = "0.0165 * safezoneW"; + h = "0.028 * safezoneH"; }; class TextMirror: RscText { idc = ID_TEXT_MIRROR; text = "$STR_3DEN_Object_Attribute_PylonsMirror_displayName"; tooltip="$STR_3DEN_Object_Attribute_PylonsMirror_tooltip"; - x = 0.188116 * safezoneW + safezoneX; - y = 0.318 * safezoneH + safezoneY; - w = 0.0656768 * safezoneW; - h = 0.028 * safezoneH; + x = "0.188116 * safezoneW + safezoneX"; + y = "0.318 * safezoneH + safezoneY"; + w = "0.0656768 * safezoneW"; + h = "0.028 * safezoneH"; colorBackground[] = {0,0,0,0.5}; }; class CheckboxFRIES: RscCheckBox { idc = ID_CHECKBOX_FRIES; - x = 0.171616 * safezoneW + safezoneX; - y = 0.346 * safezoneH + safezoneY; - w = 0.0165 * safezoneW; - h = 0.028 * safezoneH; + x = "0.171616 * safezoneW + safezoneX"; + y = "0.346 * safezoneH + safezoneY"; + w = "0.0165 * safezoneW"; + h = "0.028 * safezoneH"; }; class TextFRIES: RscText { idc = ID_TEXT_FRIES; text = "FRIES"; - x = 0.188116 * safezoneW + safezoneX; - y = 0.346 * safezoneH + safezoneY; - w = 0.0656768 * safezoneW; - h = 0.028 * safezoneH; + x = "0.188116 * safezoneW + safezoneX"; + y = "0.346 * safezoneH + safezoneY"; + w = "0.0656768 * safezoneW"; + h = "0.028 * safezoneH"; colorBackground[] = {0,0,0,0.5}; }; class TextListTitle: RscText { idc = ID_TEXT_LISTTITLE; - x = 0.624786 * safezoneW + safezoneX; - y = 0.318 * safezoneH + safezoneY; - w = 0.203437 * safezoneW; - h = 0.028 * safezoneH; + x = "0.624786 * safezoneW + safezoneX"; + y = "0.318 * safezoneH + safezoneY"; + w = "0.203437 * safezoneW"; + h = "0.028 * safezoneH"; colorBackground[] = {0,0,0,0.5}; }; class ListLoadouts: RscListBox { idc = ID_LIST_LOADOUTS; - x = 0.624786 * safezoneW + safezoneX; - y = 0.346 * safezoneH + safezoneY; - w = 0.203437 * safezoneW; - h = 0.294 * safezoneH; + x = "0.624786 * safezoneW + safezoneX"; + y = "0.346 * safezoneH + safezoneY"; + w = "0.203437 * safezoneW"; + h = "0.294 * safezoneH"; }; class EditLoadoutName: RscEdit { idc = ID_EDIT_LOADOUTNAME; - x = 0.624786 * safezoneW + safezoneX; - y = 0.64 * safezoneH + safezoneY; - w = 0.203437 * safezoneW; - h = 0.028 * safezoneH; + x = "0.624786 * safezoneW + safezoneX"; + y = "0.64 * safezoneH + safezoneY"; + w = "0.203437 * safezoneW"; + h = "0.028 * safezoneH"; colorBackground[] = {0,0,0,0.7}; }; class ButtonSave: RscButtonMenu { idc = ID_BUTTON_SAVE; action = QUOTE(call FUNC(onButtonSave)); text = "$STR_disp_int_save"; - x = 0.624786 * safezoneW + safezoneX; - y = 0.682 * safezoneH + safezoneY; - w = 0.0590625 * safezoneW; - h = 0.028 * safezoneH; + x = "0.624786 * safezoneW + safezoneX"; + y = "0.682 * safezoneH + safezoneY"; + w = "0.0590625 * safezoneW"; + h = "0.028 * safezoneH"; }; class ButtonLoad: RscButtonMenu { idc = ID_BUTTON_LOAD; action = QUOTE(call FUNC(onButtonLoad)); text = "$STR_disp_int_load"; - x = 0.69703 * safezoneW + safezoneX; - y = 0.682 * safezoneH + safezoneY; - w = 0.0590625 * safezoneW; - h = 0.028 * safezoneH; + x = "0.69703 * safezoneW + safezoneX"; + y = "0.682 * safezoneH + safezoneY"; + w = "0.0590625 * safezoneW"; + h = "0.028 * safezoneH"; }; class ButtonDelete: RscButtonMenu { idc = ID_BUTTON_DELETE; action = QUOTE(call FUNC(onButtonDelete)); text = "$STR_disp_delete"; - x = 0.769275 * safezoneW + safezoneX; - y = 0.682 * safezoneH + safezoneY; - w = 0.0590625 * safezoneW; - h = 0.028 * safezoneH; + x = "0.769275 * safezoneW + safezoneX"; + y = "0.682 * safezoneH + safezoneY"; + w = "0.0590625 * safezoneW"; + h = "0.028 * safezoneH"; }; class ButtonApply: RscButtonMenu { idc = ID_BUTTON_APPLY; action = QUOTE(call FUNC(onButtonApply)); text = "$STR_ui_debug_but_apply"; - x = 0.683895 * safezoneW + safezoneX; - y = 0.738 * safezoneH + safezoneY; - w = 0.0721875 * safezoneW; - h = 0.028 * safezoneH; + x = "0.683895 * safezoneW + safezoneX"; + y = "0.738 * safezoneH + safezoneY"; + w = "0.0721875 * safezoneW"; + h = "0.028 * safezoneH"; }; class ButtonClose: RscButtonMenu { idc = ID_BUTTON_CLOSE; text = "$STR_disp_cancel"; action = QUOTE(call FUNC(onButtonClose)); - x = 0.769275 * safezoneW + safezoneX; - y = 0.738 * safezoneH + safezoneY; - w = 0.0721875 * safezoneW; - h = 0.028 * safezoneH; + x = "0.769275 * safezoneW + safezoneX"; + y = "0.738 * safezoneH + safezoneY"; + w = "0.0721875 * safezoneW"; + h = "0.028 * safezoneH"; }; class TextBanner: RscText { idc = ID_TEXT_BANNER; text = CSTRING(BannerText); - x = 0.171616 * safezoneW + safezoneX; - y = 0.738 * safezoneH + safezoneY; - w = 0.440035 * safezoneW; - h = 0.028 * safezoneH; + x = "0.171616 * safezoneW + safezoneX"; + y = "0.738 * safezoneH + safezoneY"; + w = "0.440035 * safezoneW"; + h = "0.028 * safezoneH"; colorBackground[] = {0.5,0,0,0.5}; }; }; diff --git a/addons/rangecard/RscTitles.hpp b/addons/rangecard/RscTitles.hpp index 7c760bd993..720f724be4 100644 --- a/addons/rangecard/RscTitles.hpp +++ b/addons/rangecard/RscTitles.hpp @@ -147,7 +147,7 @@ class ACE_RangeCard_Dialog { y="safezoneY+0.181889+0.091"; w="0.25*1.62727*3/4"; h="0.0909445"; - columns[]={(0.03/2), (0.985/2)}; + columns[]={"0.03/2", "0.985/2"}; idcLeft=770101; idcRight=770102; }; @@ -157,7 +157,7 @@ class ACE_RangeCard_Dialog { y="safezoneY+0.181889+0.125"; w="0.405*1.62727*3/4"; h="0.0909445"; - columns[]={(0/9), (1/9), (2/9), (3/9), (4/9), (5/9), (5.9/9), (6.9/9), (7.8/9)}; + columns[]={"0/9", "1/9", "2/9", "3/9", "4/9", "5/9", "5.9/9", "6.9/9", "7.8/9"}; idcLeft=770201; idcRight=770202; }; @@ -167,7 +167,7 @@ class ACE_RangeCard_Dialog { y="safezoneY+0.181889+0.15"; w="0.25*1.62727*3/4"; h="0.0909445"; - columns[]={(0/6), (0.9/6), (1.8/6), (2.9/6), (3.8/6), (4.8/6)}; + columns[]={"0/6", "0.9/6", "1.8/6", "2.9/6", "3.8/6", "4.8/6"}; idcLeft=770301; idcRight=770302; }; @@ -177,8 +177,8 @@ class ACE_RangeCard_Dialog { y="safezoneY+0.181889+0.194"; w="0.72*1.62727*3/4"; h="1.62727"; - columns[]={(0/16), (1.2/16), (2.2/16), (3.2/16), (4.2/16), (5.1/16), (6.1/16), (7.1/16), (8.1/16), - (9/16), (10.2/16), (11/16), (11.9/16), (12.8/16), (13.7/16), (14.6/16)}; + columns[]={"0/16", "1.2/16", "2.2/16", "3.2/16", "4.2/16", "5.1/16", "6.1/16", "7.1/16", "8.1/16", + "9/16", "10.2/16", "11/16", "11.9/16", "12.8/16", "13.7/16", "14.6/16"}; idcLeft=770401; idcRight=770402; }; diff --git a/addons/recoil/CfgRecoils.hpp b/addons/recoil/CfgRecoils.hpp index 4b473919d5..c6482937ae 100644 --- a/addons/recoil/CfgRecoils.hpp +++ b/addons/recoil/CfgRecoils.hpp @@ -14,242 +14,558 @@ class CfgRecoils { class Default { // doc: http://forums.bistudio.com/showthread.php?188999-Recoil-Overhaul-Feedback&s=dba8590ec07adb5ffa87f72d38dde6fc&p=2886744&viewfull=1#post2886744 // {horizontal axis position, vertical axis position, horizontal magnitude, vertical magnitude} - muzzleOuter[] = {0*MUZZLERIGHT_POS,0.4*MUZZLECLIMB_POS,0.5*MUZZLERIGHT_MAG,0.6*MUZZLECLIMB_MAG}; + muzzleOuter[] = { + QUOTE(0*MUZZLERIGHT_POS), + QUOTE(0.4*MUZZLECLIMB_POS), + QUOTE(0.5*MUZZLERIGHT_MAG), + QUOTE(0.6*MUZZLECLIMB_MAG) + }; // restricted area inside the outer ellipse where the recoil cannot end muzzleInner[] = {0,0.05,0.2,0.2}; // minimum and maximum interval for backward force - kickBack[] = {0.05*KICKBACK,0.1*KICKBACK}; - permanent = 0.1*MUZZLEPERM; - temporary = 0.01*MUZZLETEMP; + kickBack[] = { + QUOTE(0.05*KICKBACK), + QUOTE(0.1*KICKBACK) + }; + permanent = QUOTE(0.1*MUZZLEPERM); + temporary = QUOTE(0.01*MUZZLETEMP); }; class recoil_default: Default { - muzzleOuter[] = {0.3*MUZZLERIGHT_POS,1*MUZZLECLIMB_POS,0.3*MUZZLERIGHT_MAG,0.2*MUZZLECLIMB_MAG}; - muzzleInner[] = {0,0,0.1,0.1}; - kickBack[] = {0.03*KICKBACK,0.06*KICKBACK}; - permanent = 0.1*MUZZLEPERM; - temporary = 0.01*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.3*MUZZLERIGHT_POS), + QUOTE(1*MUZZLECLIMB_POS), + QUOTE(0.3*MUZZLERIGHT_MAG), + QUOTE(0.2*MUZZLECLIMB_MAG) + }; + muzzleInner[] = {0, + 0, + 0.1, + 0.1 + }; + kickBack[] = { + QUOTE(0.03*KICKBACK), + QUOTE(0.06*KICKBACK) + }; + permanent = QUOTE(0.1*MUZZLEPERM); + temporary = QUOTE(0.01*MUZZLETEMP); }; class recoil_mk20: recoil_default { - muzzleOuter[] = {0.2*MUZZLERIGHT_POS,0.6*MUZZLECLIMB_POS,0.2*MUZZLERIGHT_MAG,0.2*MUZZLECLIMB_MAG}; - kickBack[] = {0.01*KICKBACK,0.03*KICKBACK}; - temporary = 0.01*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.2*MUZZLERIGHT_POS), + QUOTE(0.6*MUZZLECLIMB_POS), + QUOTE(0.2*MUZZLERIGHT_MAG), + QUOTE(0.2*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.01*KICKBACK), + QUOTE(0.03*KICKBACK) + }; + temporary = QUOTE(0.01*MUZZLETEMP); }; class recoil_mk20c: recoil_default { - muzzleOuter[] = {0.2*MUZZLERIGHT_POS,0.8*MUZZLECLIMB_POS,0.3*MUZZLERIGHT_MAG,0.2*MUZZLECLIMB_MAG}; - kickBack[] = {0.02*KICKBACK,0.04*KICKBACK}; - temporary = 0.015*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.2*MUZZLERIGHT_POS), + QUOTE(0.8*MUZZLECLIMB_POS), + QUOTE(0.3*MUZZLERIGHT_MAG), + QUOTE(0.2*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.02*KICKBACK), + QUOTE(0.04*KICKBACK) + }; + temporary = QUOTE(0.015*MUZZLETEMP); }; class recoil_trg20: recoil_default { - muzzleOuter[] = {0.2*MUZZLERIGHT_POS,1*MUZZLECLIMB_POS,0.3*MUZZLERIGHT_MAG,0.3*MUZZLECLIMB_MAG}; - kickBack[] = {0.02*KICKBACK,0.04*KICKBACK}; - temporary = 0.015*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.2*MUZZLERIGHT_POS), + QUOTE(1*MUZZLECLIMB_POS), + QUOTE(0.3*MUZZLERIGHT_MAG), + QUOTE(0.3*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.02*KICKBACK), + QUOTE(0.04*KICKBACK) + }; + temporary = QUOTE(0.015*MUZZLETEMP); }; class recoil_trg21: recoil_default { - muzzleOuter[] = {0.2*MUZZLERIGHT_POS,0.8*MUZZLECLIMB_POS,0.3*MUZZLERIGHT_MAG,0.2*MUZZLECLIMB_MAG}; - kickBack[] = {0.01*KICKBACK,0.03*KICKBACK}; - temporary = 0.01*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.2*MUZZLERIGHT_POS), + QUOTE(0.8*MUZZLECLIMB_POS), + QUOTE(0.3*MUZZLERIGHT_MAG), + QUOTE(0.2*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.01*KICKBACK), + QUOTE(0.03*KICKBACK) + }; + temporary = QUOTE(0.01*MUZZLETEMP); }; class recoil_mx: recoil_default { - muzzleOuter[] = {0.3*MUZZLERIGHT_POS,1*MUZZLECLIMB_POS,0.4*MUZZLERIGHT_MAG,0.3*MUZZLECLIMB_MAG}; - kickBack[] = {0.02*KICKBACK,0.04*KICKBACK}; - temporary = 0.01*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.3*MUZZLERIGHT_POS), + QUOTE(1*MUZZLECLIMB_POS), + QUOTE(0.4*MUZZLERIGHT_MAG), + QUOTE(0.3*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.02*KICKBACK), + QUOTE(0.04*KICKBACK) + }; + temporary = QUOTE(0.01*MUZZLETEMP); }; class recoil_mxc: recoil_default { - muzzleOuter[] = {0.3*MUZZLERIGHT_POS,1.2*MUZZLECLIMB_POS,0.4*MUZZLERIGHT_MAG,0.3*MUZZLECLIMB_MAG}; - kickBack[] = {0.03*KICKBACK,0.06*KICKBACK}; - temporary = 0.015*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.3*MUZZLERIGHT_POS), + QUOTE(1.2*MUZZLECLIMB_POS), + QUOTE(0.4*MUZZLERIGHT_MAG), + QUOTE(0.3*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.03*KICKBACK), + QUOTE(0.06*KICKBACK) + }; + temporary = QUOTE(0.015*MUZZLETEMP); }; class recoil_sw: recoil_default { - muzzleOuter[] = {0.3*MUZZLERIGHT_POS,0.8*MUZZLECLIMB_POS,0.5*MUZZLERIGHT_MAG,0.2*MUZZLECLIMB_MAG}; - kickBack[] = {0.02*KICKBACK,0.04*KICKBACK}; - temporary = 0.01*MUZZLETEMP; //0.005*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.3*MUZZLERIGHT_POS), + QUOTE(0.8*MUZZLECLIMB_POS), + QUOTE(0.5*MUZZLERIGHT_MAG), + QUOTE(0.2*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.02*KICKBACK), + QUOTE(0.04*KICKBACK) + }; + temporary = QUOTE(0.01*MUZZLETEMP); //0.005*MUZZLETEMP; }; class recoil_mxm: recoil_default { - muzzleOuter[] = {0.3*MUZZLERIGHT_POS,0.8*MUZZLECLIMB_POS,0.4*MUZZLERIGHT_MAG,0.3*MUZZLECLIMB_MAG}; - kickBack[] = {0.02*KICKBACK,0.04*KICKBACK}; - temporary = 0.01*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.3*MUZZLERIGHT_POS), + QUOTE(0.8*MUZZLECLIMB_POS), + QUOTE(0.4*MUZZLERIGHT_MAG), + QUOTE(0.3*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.02*KICKBACK), + QUOTE(0.04*KICKBACK) + }; + temporary = QUOTE(0.01*MUZZLETEMP); }; class recoil_ktb: recoil_default { - muzzleOuter[] = {0.3*MUZZLERIGHT_POS,1*MUZZLECLIMB_POS,0.3*MUZZLERIGHT_MAG,0.3*MUZZLECLIMB_MAG}; - kickBack[] = {0.02*KICKBACK,0.04*KICKBACK}; - temporary = 0.01*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.3*MUZZLERIGHT_POS), + QUOTE(1*MUZZLECLIMB_POS), + QUOTE(0.3*MUZZLERIGHT_MAG), + QUOTE(0.3*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.02*KICKBACK), + QUOTE(0.04*KICKBACK) + }; + temporary = QUOTE(0.01*MUZZLETEMP); }; class recoil_ktbc: recoil_default { - muzzleOuter[] = {0.3*MUZZLERIGHT_POS,1.2*MUZZLECLIMB_POS,0.3*MUZZLERIGHT_MAG,0.3*MUZZLECLIMB_MAG}; - kickBack[] = {0.03*KICKBACK,0.06*KICKBACK}; - temporary = 0.015*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.3*MUZZLERIGHT_POS), + QUOTE(1.2*MUZZLECLIMB_POS), + QUOTE(0.3*MUZZLERIGHT_MAG), + QUOTE(0.3*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.03*KICKBACK), + QUOTE(0.06*KICKBACK) + }; + temporary = QUOTE(0.015*MUZZLETEMP); }; class recoil_smg_01: recoil_default { - muzzleOuter[] = {0.1*MUZZLERIGHT_POS,0.8*MUZZLECLIMB_POS,0.3*MUZZLERIGHT_MAG,0.2*MUZZLECLIMB_MAG}; - kickBack[] = {0.01*KICKBACK,0.03*KICKBACK}; - temporary = 0.015*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.1*MUZZLERIGHT_POS), + QUOTE(0.8*MUZZLECLIMB_POS), + QUOTE(0.3*MUZZLERIGHT_MAG), + QUOTE(0.2*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.01*KICKBACK), + QUOTE(0.03*KICKBACK) + }; + temporary = QUOTE(0.015*MUZZLETEMP); }; class recoil_smg_02: recoil_default { - muzzleOuter[] = {0.1*MUZZLERIGHT_POS,0.6*MUZZLECLIMB_POS,0.2*MUZZLERIGHT_MAG,0.2*MUZZLECLIMB_MAG}; - kickBack[] = {0.01*KICKBACK,0.02*KICKBACK}; - temporary = 0.01*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.1*MUZZLERIGHT_POS), + QUOTE(0.6*MUZZLECLIMB_POS), + QUOTE(0.2*MUZZLERIGHT_MAG), + QUOTE(0.2*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.01*KICKBACK), + QUOTE(0.02*KICKBACK) + }; + temporary = QUOTE(0.01*MUZZLETEMP); }; class recoil_pdw: recoil_default { - muzzleOuter[] = {0.2*MUZZLERIGHT_POS,1*MUZZLECLIMB_POS,0.3*MUZZLERIGHT_MAG,0.3*MUZZLECLIMB_MAG}; - kickBack[] = {0.02*KICKBACK,0.04*KICKBACK}; - temporary = 0.02*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.2*MUZZLERIGHT_POS), + QUOTE(1*MUZZLECLIMB_POS), + QUOTE(0.3*MUZZLERIGHT_MAG), + QUOTE(0.3*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.02*KICKBACK), + QUOTE(0.04*KICKBACK) + }; + temporary = QUOTE(0.02*MUZZLETEMP); }; class recoil_sdar: recoil_default { - muzzleOuter[] = {0.2*MUZZLERIGHT_POS,1*MUZZLECLIMB_POS,0.3*MUZZLERIGHT_MAG,0.3*MUZZLECLIMB_MAG}; - kickBack[] = {0.02*KICKBACK,0.04*KICKBACK}; - temporary = 0.01*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.2*MUZZLERIGHT_POS), + QUOTE(1*MUZZLECLIMB_POS), + QUOTE(0.3*MUZZLERIGHT_MAG), + QUOTE(0.3*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.02*KICKBACK), + QUOTE(0.04*KICKBACK) + }; + temporary = QUOTE(0.01*MUZZLETEMP); }; class recoil_pistol_p07: recoil_default { - muzzleOuter[] = {0.2*MUZZLERIGHT_POS,1*MUZZLECLIMB_POS,0.2*MUZZLERIGHT_MAG,0.3*MUZZLECLIMB_MAG}; - kickBack[] = {0.03*KICKBACK,0.06*KICKBACK}; - temporary = 0.03*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.2*MUZZLERIGHT_POS), + QUOTE(1*MUZZLECLIMB_POS), + QUOTE(0.2*MUZZLERIGHT_MAG), + QUOTE(0.3*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.03*KICKBACK), + QUOTE(0.06*KICKBACK) + }; + temporary = QUOTE(0.03*MUZZLETEMP); }; class recoil_pistol_rook40: recoil_default { - muzzleOuter[] = {0.2*MUZZLERIGHT_POS,1*MUZZLECLIMB_POS,0.2*MUZZLERIGHT_MAG,0.3*MUZZLECLIMB_MAG}; - kickBack[] = {0.03*KICKBACK,0.06*KICKBACK}; - temporary = 0.02*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.2*MUZZLERIGHT_POS), + QUOTE(1*MUZZLECLIMB_POS), + QUOTE(0.2*MUZZLERIGHT_MAG), + QUOTE(0.3*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.03*KICKBACK), + QUOTE(0.06*KICKBACK) + }; + temporary = QUOTE(0.02*MUZZLETEMP); }; class recoil_pistol_acpc2: recoil_default { - muzzleOuter[] = {0.2*MUZZLERIGHT_POS,1.5*MUZZLECLIMB_POS,0.2*MUZZLERIGHT_MAG,0.3*MUZZLECLIMB_MAG}; - kickBack[] = {0.04*KICKBACK,0.08*KICKBACK}; - temporary = 0.04*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.2*MUZZLERIGHT_POS), + QUOTE(1.5*MUZZLECLIMB_POS), + QUOTE(0.2*MUZZLERIGHT_MAG), + QUOTE(0.3*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.04*KICKBACK), + QUOTE(0.08*KICKBACK) + }; + temporary = QUOTE(0.04*MUZZLETEMP); }; class recoil_pistol_4five: recoil_default { - muzzleOuter[] = {0.2*MUZZLERIGHT_POS,1.5*MUZZLECLIMB_POS,0.2*MUZZLERIGHT_MAG,0.3*MUZZLECLIMB_MAG}; - kickBack[] = {0.04*KICKBACK,0.08*KICKBACK}; - temporary = 0.06*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.2*MUZZLERIGHT_POS), + QUOTE(1.5*MUZZLECLIMB_POS), + QUOTE(0.2*MUZZLERIGHT_MAG), + QUOTE(0.3*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.04*KICKBACK), + QUOTE(0.08*KICKBACK) + }; + temporary = QUOTE(0.06*MUZZLETEMP); }; class recoil_pistol_zubr: recoil_default { - muzzleOuter[] = {0.2*MUZZLERIGHT_POS,1.5*MUZZLECLIMB_POS,0.2*MUZZLERIGHT_MAG,0.3*MUZZLECLIMB_MAG}; - kickBack[] = {0.04*KICKBACK,0.08*KICKBACK}; - temporary = 0.08*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.2*MUZZLERIGHT_POS), + QUOTE(1.5*MUZZLECLIMB_POS), + QUOTE(0.2*MUZZLERIGHT_MAG), + QUOTE(0.3*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.04*KICKBACK), + QUOTE(0.08*KICKBACK) + }; + temporary = QUOTE(0.08*MUZZLETEMP); }; class recoil_pistol_signal: recoil_default { - muzzleOuter[] = {0.2*MUZZLERIGHT_POS,1.5*MUZZLECLIMB_POS,0.2*MUZZLERIGHT_MAG,0.3*MUZZLECLIMB_MAG}; - kickBack[] = {0.02*KICKBACK,0.04*KICKBACK}; - temporary = 0.02*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.2*MUZZLERIGHT_POS), + QUOTE(1.5*MUZZLECLIMB_POS), + QUOTE(0.2*MUZZLERIGHT_MAG), + QUOTE(0.3*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.02*KICKBACK), + QUOTE(0.04*KICKBACK) + }; + temporary = QUOTE(0.02*MUZZLETEMP); }; class recoil_rpg: recoil_default { - muzzleOuter[] = {2*MUZZLERIGHT_POS,3*MUZZLECLIMB_POS,1*MUZZLERIGHT_MAG,0.5*MUZZLECLIMB_MAG}; - kickBack[] = {0.08*KICKBACK,0.1*KICKBACK}; - temporary = 0.1*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(2*MUZZLERIGHT_POS), + QUOTE(3*MUZZLECLIMB_POS), + QUOTE(1*MUZZLERIGHT_MAG), + QUOTE(0.5*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.08*KICKBACK), + QUOTE(0.1*KICKBACK) + }; + temporary = QUOTE(0.1*MUZZLETEMP); }; class recoil_nlaw: recoil_default { - muzzleOuter[] = {2*MUZZLERIGHT_POS,3*MUZZLECLIMB_POS,1*MUZZLERIGHT_MAG,0.5*MUZZLECLIMB_MAG}; - kickBack[] = {0.06*KICKBACK,0.08*KICKBACK}; - temporary = 0.08*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(2*MUZZLERIGHT_POS), + QUOTE(3*MUZZLECLIMB_POS), + QUOTE(1*MUZZLERIGHT_MAG), + QUOTE(0.5*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.06*KICKBACK), + QUOTE(0.08*KICKBACK) + }; + temporary = QUOTE(0.08*MUZZLETEMP); }; class recoil_titan_long: recoil_default { - muzzleOuter[] = {2*MUZZLERIGHT_POS,3*MUZZLECLIMB_POS,1*MUZZLERIGHT_MAG,0.5*MUZZLECLIMB_MAG}; - kickBack[] = {0.1*KICKBACK,0.12*KICKBACK}; - temporary = 0.15*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(2*MUZZLERIGHT_POS), + QUOTE(3*MUZZLECLIMB_POS), + QUOTE(1*MUZZLERIGHT_MAG), + QUOTE(0.5*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.1*KICKBACK), + QUOTE(0.12*KICKBACK) + }; + temporary = QUOTE(0.15*MUZZLETEMP); }; class recoil_titan_short: recoil_default { - muzzleOuter[] = {2*MUZZLERIGHT_POS,3*MUZZLECLIMB_POS,1*MUZZLERIGHT_MAG,0.5*MUZZLECLIMB_MAG}; - kickBack[] = {0.1*KICKBACK,0.12*KICKBACK}; - temporary = 0.12*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(2*MUZZLERIGHT_POS), + QUOTE(3*MUZZLECLIMB_POS), + QUOTE(1*MUZZLERIGHT_MAG), + QUOTE(0.5*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.1*KICKBACK), + QUOTE(0.12*KICKBACK) + }; + temporary = QUOTE(0.12*MUZZLETEMP); }; class recoil_mk200: recoil_default { - muzzleOuter[] = {0.4*MUZZLERIGHT_POS,0.6*MUZZLECLIMB_POS,0.6*MUZZLERIGHT_MAG,0.2*MUZZLECLIMB_MAG}; - kickBack[] = {0.03*KICKBACK,0.06*KICKBACK}; - temporary = 0.01*MUZZLETEMP; //0.005*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.4*MUZZLERIGHT_POS), + QUOTE(0.6*MUZZLECLIMB_POS), + QUOTE(0.6*MUZZLERIGHT_MAG), + QUOTE(0.2*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.03*KICKBACK), + QUOTE(0.06*KICKBACK) + }; + temporary = QUOTE(0.01*MUZZLETEMP); //0.005*MUZZLETEMP; }; class recoil_zafir: recoil_default { - muzzleOuter[] = {0.5*MUZZLERIGHT_POS,1*MUZZLECLIMB_POS,0.7*MUZZLERIGHT_MAG,0.3*MUZZLECLIMB_MAG}; - kickBack[] = {0.02*KICKBACK,0.08*KICKBACK}; - temporary = 0.01*MUZZLETEMP; //0.005*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.5*MUZZLERIGHT_POS), + QUOTE(1*MUZZLECLIMB_POS), + QUOTE(0.7*MUZZLERIGHT_MAG), + QUOTE(0.3*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.02*KICKBACK), + QUOTE(0.08*KICKBACK) + }; + temporary = QUOTE(0.01*MUZZLETEMP); //0.005*MUZZLETEMP; }; class recoil_m320: recoil_default { - muzzleOuter[] = {1*MUZZLERIGHT_POS,3*MUZZLECLIMB_POS,0.5*MUZZLERIGHT_MAG,0.6*MUZZLECLIMB_MAG}; - kickBack[] = {0.08*KICKBACK,0.1*KICKBACK}; - temporary = 0.02*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(1*MUZZLERIGHT_POS), + QUOTE(3*MUZZLECLIMB_POS), + QUOTE(0.5*MUZZLERIGHT_MAG), + QUOTE(0.6*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.08*KICKBACK), + QUOTE(0.1*KICKBACK) + }; + temporary = QUOTE(0.02*MUZZLETEMP); }; class recoil_gm6: recoil_default { - muzzleOuter[] = {1.4*MUZZLERIGHT_POS,3.5*MUZZLECLIMB_POS,0.7*MUZZLERIGHT_MAG,0.8*MUZZLECLIMB_MAG}; - kickBack[] = {0.1*KICKBACK,0.12*KICKBACK}; - temporary = 0.025*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(1.4*MUZZLERIGHT_POS), + QUOTE(3.5*MUZZLECLIMB_POS), + QUOTE(0.7*MUZZLERIGHT_MAG), + QUOTE(0.8*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.1*KICKBACK), + QUOTE(0.12*KICKBACK) + }; + temporary = QUOTE(0.025*MUZZLETEMP); }; class recoil_ebr: recoil_default { - muzzleOuter[] = {0.4*MUZZLERIGHT_POS,1.5*MUZZLECLIMB_POS,0.6*MUZZLERIGHT_MAG,0.4*MUZZLECLIMB_MAG}; - kickBack[] = {0.04*KICKBACK,0.07*KICKBACK}; - temporary = 0.01*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.4*MUZZLERIGHT_POS), + QUOTE(1.5*MUZZLECLIMB_POS), + QUOTE(0.6*MUZZLERIGHT_MAG), + QUOTE(0.4*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.04*KICKBACK), + QUOTE(0.07*KICKBACK) + }; + temporary = QUOTE(0.01*MUZZLETEMP); }; class recoil_dmr_01: recoil_default { - muzzleOuter[] = {0.5*MUZZLERIGHT_POS,2*MUZZLECLIMB_POS,0.5*MUZZLERIGHT_MAG,0.5*MUZZLECLIMB_MAG}; - kickBack[] = {0.03*KICKBACK,0.08*KICKBACK}; - temporary = 0.015*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.5*MUZZLERIGHT_POS), + QUOTE(2*MUZZLECLIMB_POS), + QUOTE(0.5*MUZZLERIGHT_MAG), + QUOTE(0.5*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.03*KICKBACK), + QUOTE(0.08*KICKBACK) + }; + temporary = QUOTE(0.015*MUZZLETEMP); }; class recoil_dmr_02: recoil_default { - muzzleOuter[] = {0.5*MUZZLERIGHT_POS,2.5*MUZZLECLIMB_POS,0.6*MUZZLERIGHT_MAG,0.5*MUZZLECLIMB_MAG}; - kickBack[] = {0.06*KICKBACK,0.08*KICKBACK}; - temporary = 0.01*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.5*MUZZLERIGHT_POS), + QUOTE(2.5*MUZZLECLIMB_POS), + QUOTE(0.6*MUZZLERIGHT_MAG), + QUOTE(0.5*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.06*KICKBACK), + QUOTE(0.08*KICKBACK) + }; + temporary = QUOTE(0.01*MUZZLETEMP); }; class recoil_dmr_03: recoil_default { - muzzleOuter[] = {0.3*MUZZLERIGHT_POS,1.5*MUZZLECLIMB_POS,0.5*MUZZLERIGHT_MAG,0.4*MUZZLECLIMB_MAG}; - kickBack[] = {0.03*KICKBACK,0.06*KICKBACK}; - temporary = 0.005*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.3*MUZZLERIGHT_POS), + QUOTE(1.5*MUZZLECLIMB_POS), + QUOTE(0.5*MUZZLERIGHT_MAG), + QUOTE(0.4*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.03*KICKBACK), + QUOTE(0.06*KICKBACK) + }; + temporary = QUOTE(0.005*MUZZLETEMP); }; class recoil_dmr_04: recoil_default { - muzzleOuter[] = {0.4*MUZZLERIGHT_POS,1.5*MUZZLECLIMB_POS,0.5*MUZZLERIGHT_MAG,0.4*MUZZLECLIMB_MAG}; - kickBack[] = {0.02*KICKBACK,0.04*KICKBACK}; - temporary = 0.015*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.4*MUZZLERIGHT_POS), + QUOTE(1.5*MUZZLECLIMB_POS), + QUOTE(0.5*MUZZLERIGHT_MAG), + QUOTE(0.4*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.02*KICKBACK), + QUOTE(0.04*KICKBACK) + }; + temporary = QUOTE(0.015*MUZZLETEMP); }; class recoil_dmr_05: recoil_default { - muzzleOuter[] = {0.5*MUZZLERIGHT_POS,2.5*MUZZLECLIMB_POS,0.8*MUZZLERIGHT_MAG,0.6*MUZZLECLIMB_MAG}; - kickBack[] = {0.08*KICKBACK,0.1*KICKBACK}; - temporary = 0.01*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.5*MUZZLERIGHT_POS), + QUOTE(2.5*MUZZLECLIMB_POS), + QUOTE(0.8*MUZZLERIGHT_MAG), + QUOTE(0.6*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.08*KICKBACK), + QUOTE(0.1*KICKBACK) + }; + temporary = QUOTE(0.01*MUZZLETEMP); }; class recoil_dmr_06: recoil_default { - muzzleOuter[] = {0.5*MUZZLERIGHT_POS,2*MUZZLECLIMB_POS,0.7*MUZZLERIGHT_MAG,0.5*MUZZLECLIMB_MAG}; - kickBack[] = {0.05*KICKBACK,0.1*KICKBACK}; - temporary = 0.01*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.5*MUZZLERIGHT_POS), + QUOTE(2*MUZZLECLIMB_POS), + QUOTE(0.7*MUZZLERIGHT_MAG), + QUOTE(0.5*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.05*KICKBACK), + QUOTE(0.1*KICKBACK) + }; + temporary = QUOTE(0.01*MUZZLETEMP); }; class recoil_mmg_01: recoil_default { - muzzleOuter[] = {0.6*MUZZLERIGHT_POS,1.5*MUZZLECLIMB_POS,0.8*MUZZLERIGHT_MAG,0.3*MUZZLECLIMB_MAG}; - kickBack[] = {0.02*KICKBACK,0.08*KICKBACK}; - temporary = 0.01*MUZZLETEMP; //0.005*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.6*MUZZLERIGHT_POS), + QUOTE(1.5*MUZZLECLIMB_POS), + QUOTE(0.8*MUZZLERIGHT_MAG), + QUOTE(0.3*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.02*KICKBACK), + QUOTE(0.08*KICKBACK) + }; + temporary = QUOTE(0.01*MUZZLETEMP); //0.005*MUZZLETEMP; }; class recoil_mmg_02: recoil_default { - muzzleOuter[] = {0.5*MUZZLERIGHT_POS,1.5*MUZZLECLIMB_POS,0.6*MUZZLERIGHT_MAG,0.4*MUZZLECLIMB_MAG}; - kickBack[] = {0.04*KICKBACK,0.08*KICKBACK}; - temporary = 0.01*MUZZLETEMP; //0.005*MUZZLETEMP; + muzzleOuter[] = { + QUOTE(0.5*MUZZLERIGHT_POS), + QUOTE(1.5*MUZZLECLIMB_POS), + QUOTE(0.6*MUZZLERIGHT_MAG), + QUOTE(0.4*MUZZLECLIMB_MAG) + }; + kickBack[] = { + QUOTE(0.04*KICKBACK), + QUOTE(0.08*KICKBACK) + }; + temporary = QUOTE(0.01*MUZZLETEMP); //0.005*MUZZLETEMP; }; }; diff --git a/addons/refuel/CfgVehicles.hpp b/addons/refuel/CfgVehicles.hpp index 53a21e7318..6415ab97e1 100644 --- a/addons/refuel/CfgVehicles.hpp +++ b/addons/refuel/CfgVehicles.hpp @@ -98,7 +98,7 @@ class CfgVehicles { model = QPATHTOF(data\nozzle.p3d); destrType = "DestructNo"; }; - + class Rope; class GVAR(fuelHose): Rope { hiddenSelections[] = {"rope"}; @@ -267,7 +267,7 @@ class CfgVehicles { }; class Van_01_fuel_base_F: Van_01_base_F { - GVAR(hooks)[] = {{0.38,-3.17,-.7},{-0.41,-3.17,-.7}}; + GVAR(hooks)[] = {{0.38,-3.17,-0.7},{-0.41,-3.17,-0.7}}; GVAR(fuelCargo) = 2000; }; class C_Van_01_fuel_F: Van_01_fuel_base_F { @@ -291,7 +291,7 @@ class CfgVehicles { class B_APC_Tracked_01_CRV_F: B_APC_Tracked_01_base_F { transportFuel = 0; //3k - GVAR(hooks)[] = {{-1.08,-4.81,-.8}}; + GVAR(hooks)[] = {{-1.08,-4.81,-0.8}}; GVAR(fuelCargo) = 1000; }; @@ -412,13 +412,13 @@ class CfgVehicles { class B_Truck_01_fuel_F: B_Truck_01_mover_F { transportFuel = 0; //3k - GVAR(hooks)[] = {{.28,-4.99,-.3},{-.25,-4.99,-.3}}; + GVAR(hooks)[] = {{0.28,-4.99,-0.3},{-0.25,-4.99,-0.3}}; GVAR(fuelCargo) = 10000; }; class O_Truck_03_fuel_F: Truck_03_base_F { transportFuel = 0; //3k - GVAR(hooks)[] = {{1.3,-1.59,-.62},{-1.16,-1.59,-.62}}; + GVAR(hooks)[] = {{1.3,-1.59,-0.62},{-1.16,-1.59,-0.62}}; GVAR(fuelCargo) = 10000; }; @@ -432,7 +432,7 @@ class CfgVehicles { class Pod_Heli_Transport_04_base_F: Slingload_base_F {}; class Land_Pod_Heli_Transport_04_fuel_F: Pod_Heli_Transport_04_base_F { transportFuel = 0; //3k - GVAR(hooks)[] = {{-1.49,1.41,-.3}}; + GVAR(hooks)[] = {{-1.49,1.41,-0.3}}; GVAR(fuelCargo) = 10000; }; @@ -495,7 +495,7 @@ class CfgVehicles { class Land_fs_feed_F: House_Small_F { transportFuel = 0; //50k - GVAR(hooks)[] = {{-0.4,0.022,-.23}}; + GVAR(hooks)[] = {{-0.4,0.022,-0.23}}; GVAR(fuelCargo) = REFUEL_INFINITE_FUEL; }; diff --git a/addons/scopes/RscTitles.hpp b/addons/scopes/RscTitles.hpp index 4dd1b7addf..c108caaf4d 100644 --- a/addons/scopes/RscTitles.hpp +++ b/addons/scopes/RscTitles.hpp @@ -18,7 +18,7 @@ class RscTitles { idc = 11; type = 0; text = QPATHTOF(UI\scopes_bg.paa); - style = 48 + 0x800; + style = "48 + 0x800"; scale = 1; sizeEx = 1; font = "RobotoCondensed"; @@ -26,10 +26,10 @@ class RscTitles { colorBackground[] = { 1, 1, 1, 1 }; shadow = 1; - x = (0.5 - 0.4 / 2) * safezoneW + safezoneX; - y = 0 * safezoneH + safezoneY; - w = 0.4 * safezoneW; - h = 0.3 * safezoneH; + x = "(0.5 - 0.4 / 2) * safezoneW + safezoneX"; + y = "0 * safezoneH + safezoneY"; + w = "0.4 * safezoneW"; + h = "0.3 * safezoneH"; }; class ACE_Scopes_Zeroing_Vertical: RscText { idc = 12; @@ -43,10 +43,10 @@ class RscTitles { colorBackground[] = { 1, 0, 0, 0 }; shadow = 0; - x = (0.5 - 0.4 / 2 + 0.45*0.4) * safezoneW + safezoneX; - y = (0 + 0.19*0.3) * safezoneH + safezoneY; - w = 0.04 * safezoneW; - h = 0.025 * safezoneH; + x = "(0.5 - 0.4 / 2 + 0.45*0.4) * safezoneW + safezoneX"; + y = "(0 + 0.19*0.3) * safezoneH + safezoneY"; + w = "0.04 * safezoneW"; + h = "0.025 * safezoneH"; }; class ACE_Scopes_Zeroing_Horizontal: RscText { idc = 13; @@ -60,10 +60,10 @@ class RscTitles { colorBackground[] = { 1, 0, 0, 0 }; shadow = 0; - x = (0.5 - 0.4 / 2 + 0.6*0.4) * safezoneW + safezoneX; - y = (0 + 0.47*0.3) * safezoneH + safezoneY; - w = 0.019 * safezoneW; - h = 0.025 * safezoneH; + x = "(0.5 - 0.4 / 2 + 0.6*0.4) * safezoneW + safezoneX"; + y = "(0 + 0.47*0.3) * safezoneH + safezoneY"; + w = "0.019 * safezoneW"; + h = "0.025 * safezoneH"; }; }; }; diff --git a/addons/spectator/ui.hpp b/addons/spectator/ui.hpp index 8ffd1b5ebd..f61e7749ee 100644 --- a/addons/spectator/ui.hpp +++ b/addons/spectator/ui.hpp @@ -55,9 +55,9 @@ class GVAR(display) { onTreeDblClick = QUOTE([ARR_2(true,_this)] call FUNC(ui_handleListClick)); x = "safeZoneX"; - y = safeZoneY + H_PART(1.5); - w = W_PART(13.5); - h = safeZoneH - H_PART(1.5); + y = QUOTE(safeZoneY + H_PART(1.5)); + w = QUOTE(W_PART(13.5)); + h = QUOTE(safeZoneH - H_PART(1.5)); disableKeyboardSearch = 1; multiselectEnabled = 0; @@ -83,30 +83,30 @@ class GVAR(display) { x = "safeZoneX"; y = "safezoneY"; - w = W_PART(13.5); - h = H_PART(1.5); + w = QUOTE(W_PART(13.5)); + h = QUOTE(H_PART(1.5)); fade = 0.5; rows = 1; columns = 1; strings[] = {"$STR_A3_Spectator_Entities"}; values[] = {0}; - sizeEx = H_PART(1); + sizeEx = QUOTE(H_PART(1)); colorBackground[] = {0,0,0,0.75}; colorSelectedBg[] = {0,0,0,0.65}; }; class CameraTypesGroup: RscControlsGroupNoScrollbars { idc = IDC_CAM_TYPES; - x = X_PART(15.5); - y = safezoneY + safezoneH - H_PART(2.38); - w = W_PART(8.6); + x = QUOTE(X_PART(15.5)); + y = QUOTE(safezoneY + safezoneH - H_PART(2.38)); + w = QUOTE(W_PART(8.6)); h = 2.6; class controls { class CameraTypesBackground: RscText { - x = W_PART(0.6); - y = H_PART(0.4); - w = W_PART(7.5); - h = H_PART(2); + x = QUOTE(W_PART(0.6)); + y = QUOTE(H_PART(0.4)); + w = QUOTE(W_PART(7.5)); + h = QUOTE(H_PART(2)); colorBackground[] = {0,0,0,0.75}; }; class Free: RscButton { @@ -115,10 +115,10 @@ class GVAR(display) { onButtonClick = QUOTE([MODE_FREE] call FUNC(cam_setCameraMode)); - x = W_PART(1.3); - y = H_PART(0.8); - w = W_PART(1.63); - h = H_PART(1.37); + x = QUOTE(W_PART(1.3)); + y = QUOTE(H_PART(0.8)); + w = QUOTE(W_PART(1.63)); + h = QUOTE(H_PART(1.37)); colorBackground[] = {0,0,0,0}; colorBackgroundDisabled[] = {0,0,0,0}; @@ -133,10 +133,10 @@ class GVAR(display) { onButtonClick = QUOTE([MODE_FOLLOW] call FUNC(cam_setCameraMode)); - x = W_PART(3.6); - y = H_PART(0.8); - w = W_PART(1.63); - h = H_PART(1.37); + x = QUOTE(W_PART(3.6)); + y = QUOTE(H_PART(0.8)); + w = QUOTE(W_PART(1.63)); + h = QUOTE(H_PART(1.37)); colorBackground[] = {0,0,0,0}; colorBackgroundDisabled[] = {0,0,0,0}; @@ -151,10 +151,10 @@ class GVAR(display) { onButtonClick = QUOTE([MODE_FPS] call FUNC(cam_setCameraMode)); - x = W_PART(5.8); - y = H_PART(0.8); - w = W_PART(1.63); - h = H_PART(1.37); + x = QUOTE(W_PART(5.8)); + y = QUOTE(H_PART(0.8)); + w = QUOTE(W_PART(1.63)); + h = QUOTE(H_PART(1.37)); colorBackground[] = {0,0,0,0}; colorBackgroundDisabled[] = {0,0,0,0}; @@ -189,7 +189,7 @@ class GVAR(display) { text = ""; style = 2; colorBackground[] = {0,0,0,0.75}; - sizeEx = H_PART(1); + sizeEx = QUOTE(H_PART(1)); }; class GameTimeText: RscText { idc = IDC_TIME; @@ -198,7 +198,7 @@ class GVAR(display) { w = 0.29; h = 0.03; text = "00:00:00"; - sizeEx = H_PART(1); + sizeEx = QUOTE(H_PART(1)); }; class MapTitle: RscText { idc = IDC_MAP_TITLE; @@ -208,7 +208,7 @@ class GVAR(display) { h = 0.03; text = ""; colorText[] = {1,1,1,1}; - sizeEx = H_PART(1); + sizeEx = QUOTE(H_PART(1)); }; class SpectatorsCount: RscText { idc = IDC_MAP_SPEC_NUM; @@ -218,7 +218,7 @@ class GVAR(display) { h = 0.03; text = ""; colorText[] = {1,1,1,1}; - sizeEx = H_PART(1); + sizeEx = QUOTE(H_PART(1)); }; class SpectatorsIcon: RscPictureKeepAspect { x = 0.94; @@ -245,214 +245,214 @@ class GVAR(display) { }; class HelpBackground: RscText { idc = IDC_HELP_BACK; - x = safezoneX + safezoneW - W_PART(12); - y = safezoneY + safezoneH - H_PART(8); - w = W_PART(12); - h = H_PART(8); + x = QUOTE(safezoneX + safezoneW - W_PART(12)); + y = QUOTE(safezoneY + safezoneH - H_PART(8)); + w = QUOTE(W_PART(12)); + h = QUOTE(H_PART(8)); colorBackground[] = {0,0,0,0.75}; }; class Help: RscListNBox { class ListScrollBar: ScrollBar {}; disableOverflow = 0; - rowHeight = H_PART(1); + rowHeight = QUOTE(H_PART(1)); idc = IDC_HELP; - x = safezoneX + safezoneW - W_PART(12); - y = safezoneY + safezoneH - H_PART(12); - w = W_PART(12); - h = H_PART(12); + x = QUOTE(safezoneX + safezoneW - W_PART(12)); + y = QUOTE(safezoneY + safezoneH - H_PART(12)); + w = QUOTE(W_PART(12)); + h = QUOTE(H_PART(12)); }; class FocusInfo: RscControlsGroupNoScrollbars { idc = IDC_WIDGET; - x = X_PART(12.9); - y = Y_PART(24); - w = W_PART(14.2); - h = H_PART(3.5); + x = QUOTE(X_PART(12.9)); + y = QUOTE(Y_PART(24)); + w = QUOTE(W_PART(14.2)); + h = QUOTE(H_PART(3.5)); class controls { class UpperBackground: RscText { x = 0; y = 0; - w = W_PART(14.2); - h = H_PART(1.4); + w = QUOTE(W_PART(14.2)); + h = QUOTE(H_PART(1.4)); colorBackground[] = {0,0,0,0.75}; }; class StatsBackground: RscText { x = 0; - y = H_PART(1.5); - w = W_PART(6); - h = H_PART(2); + y = QUOTE(H_PART(1.5)); + w = QUOTE(W_PART(6)); + h = QUOTE(H_PART(2)); colorBackground[] = {0,0,0,0.75}; }; class WeaponBackground: RscText { - x = W_PART(6.1); - y = H_PART(1.5); - w = W_PART(6); - h = H_PART(2); + x = QUOTE(W_PART(6.1)); + y = QUOTE(H_PART(1.5)); + w = QUOTE(W_PART(6)); + h = QUOTE(H_PART(2)); colorBackground[] = {1,1,1,0.4}; }; class ThrowableBackground: RscText { - x = W_PART(12.2); - y = H_PART(1.5); - w = W_PART(2); - h = H_PART(2); + x = QUOTE(W_PART(12.2)); + y = QUOTE(H_PART(1.5)); + w = QUOTE(W_PART(2)); + h = QUOTE(H_PART(2)); colorBackground[] = {1,1,1,0.4}; }; class Name: RscText { shadow = 0; idc = IDC_WIDGET_NAME; text = ""; - x = W_PART(0.1); - y = H_PART(0.1); - w = W_PART(10.8); - h = H_PART(1.2); - sizeEx = H_PART(1); + x = QUOTE(W_PART(0.1)); + y = QUOTE(H_PART(0.1)); + w = QUOTE(W_PART(10.8)); + h = QUOTE(H_PART(1.2)); + sizeEx = QUOTE(H_PART(1)); }; class VehiclePos: RscPictureKeepAspect { idc = IDC_WIDGET_VEHICLE_POS; text = ""; - x = W_PART(11); - y = H_PART(0.2); - w = W_PART(1); - h = H_PART(1); + x = QUOTE(W_PART(11)); + y = QUOTE(H_PART(0.2)); + w = QUOTE(W_PART(1)); + h = QUOTE(H_PART(1)); }; class VehicleType: RscPicture { idc = IDC_WIDGET_VEHICLE; text = ""; - x = W_PART(12.1); - y = H_PART(0.2); - w = W_PART(2); - h = H_PART(1); + x = QUOTE(W_PART(12.1)); + y = QUOTE(H_PART(0.2)); + w = QUOTE(W_PART(2)); + h = QUOTE(H_PART(1)); }; class UnitType: RscPictureKeepAspect { idc = IDC_WIDGET_UNIT; text = ""; - x = W_PART(13.1); - y = H_PART(0.2); - w = W_PART(1); - h = H_PART(1); + x = QUOTE(W_PART(13.1)); + y = QUOTE(H_PART(0.2)); + w = QUOTE(W_PART(1)); + h = QUOTE(H_PART(1)); }; class Kills: RscPictureKeepAspect { text = "a3\Ui_f\data\IGUI\Cfg\MPTable\infantry_ca.paa"; - x = W_PART(0.1); - y = H_PART(1.6); - w = W_PART(0.8); - h = H_PART(0.8); + x = QUOTE(W_PART(0.1)); + y = QUOTE(H_PART(1.6)); + w = QUOTE(W_PART(0.8)); + h = QUOTE(H_PART(0.8)); }; class LandKills: RscPictureKeepAspect { text = "a3\Ui_f\data\IGUI\Cfg\MPTable\soft_ca.paa"; - x = W_PART(1.1); - y = H_PART(1.6); - w = W_PART(0.8); - h = H_PART(0.8); + x = QUOTE(W_PART(1.1)); + y = QUOTE(H_PART(1.6)); + w = QUOTE(W_PART(0.8)); + h = QUOTE(H_PART(0.8)); }; class ArmoredKills: RscPictureKeepAspect { text = "a3\Ui_f\data\IGUI\Cfg\MPTable\armored_ca.paa"; - x = W_PART(2.1); - y = H_PART(1.6); - w = W_PART(0.8); - h = H_PART(0.8); + x = QUOTE(W_PART(2.1)); + y = QUOTE(H_PART(1.6)); + w = QUOTE(W_PART(0.8)); + h = QUOTE(H_PART(0.8)); }; class AirKills: RscPictureKeepAspect { text = "a3\Ui_f\data\IGUI\Cfg\MPTable\air_ca.paa"; - x = W_PART(3.1); - y = H_PART(1.6); - w = W_PART(0.8); - h = H_PART(0.8); + x = QUOTE(W_PART(3.1)); + y = QUOTE(H_PART(1.6)); + w = QUOTE(W_PART(0.8)); + h = QUOTE(H_PART(0.8)); }; class Deaths: RscPictureKeepAspect { text = "a3\Ui_f\data\IGUI\Cfg\MPTable\killed_ca.paa"; - x = W_PART(4.1); - y = H_PART(1.6); - w = W_PART(0.8); - h = H_PART(0.8); + x = QUOTE(W_PART(4.1)); + y = QUOTE(H_PART(1.6)); + w = QUOTE(W_PART(0.8)); + h = QUOTE(H_PART(0.8)); }; class Total: RscPictureKeepAspect { text = "a3\Ui_f\data\IGUI\Cfg\MPTable\total_ca.paa"; - x = W_PART(5.1); - y = H_PART(1.6); - w = W_PART(0.8); - h = H_PART(0.8); + x = QUOTE(W_PART(5.1)); + y = QUOTE(H_PART(1.6)); + w = QUOTE(W_PART(0.8)); + h = QUOTE(H_PART(0.8)); }; class Kills_Count: RscText { style = 2; shadow = 0; idc = IDC_WIDGET_KILLS; text = ""; - x = W_PART(0.1); - y = H_PART(2.5); - w = W_PART(0.8); - h = H_PART(0.9); - sizeEx = H_PART(0.7); + x = QUOTE(W_PART(0.1)); + y = QUOTE(H_PART(2.5)); + w = QUOTE(W_PART(0.8)); + h = QUOTE(H_PART(0.9)); + sizeEx = QUOTE(H_PART(0.7)); }; class LandKills_Count: RscText { style = 2; shadow = 0; idc = IDC_WIDGET_LAND; text = ""; - x = W_PART(1.1); - y = H_PART(2.5); - w = W_PART(0.8); - h = H_PART(0.9); - sizeEx = H_PART(0.7); + x = QUOTE(W_PART(1.1)); + y = QUOTE(H_PART(2.5)); + w = QUOTE(W_PART(0.8)); + h = QUOTE(H_PART(0.9)); + sizeEx = QUOTE(H_PART(0.7)); }; class ArmoredKills_Count: RscText { style = 2; shadow = 0; idc = IDC_WIDGET_ARMORED; text = ""; - x = W_PART(2.1); - y = H_PART(2.5); - w = W_PART(0.8); - h = H_PART(0.9); - sizeEx = H_PART(0.7); + x = QUOTE(W_PART(2.1)); + y = QUOTE(H_PART(2.5)); + w = QUOTE(W_PART(0.8)); + h = QUOTE(H_PART(0.9)); + sizeEx = QUOTE(H_PART(0.7)); }; class AirKills_Count: RscText { style = 2; shadow = 0; idc = IDC_WIDGET_AIR; text = ""; - x = W_PART(3.1); - y = H_PART(2.5); - w = W_PART(0.8); - h = H_PART(0.9); - sizeEx = H_PART(0.7); + x = QUOTE(W_PART(3.1)); + y = QUOTE(H_PART(2.5)); + w = QUOTE(W_PART(0.8)); + h = QUOTE(H_PART(0.9)); + sizeEx = QUOTE(H_PART(0.7)); }; class Deaths_Count: RscText { style = 2; shadow = 0; idc = IDC_WIDGET_DEATHS; text = ""; - x = W_PART(4.1); - y = H_PART(2.5); - w = W_PART(0.8); - h = H_PART(0.9); - sizeEx = H_PART(0.7); + x = QUOTE(W_PART(4.1)); + y = QUOTE(H_PART(2.5)); + w = QUOTE(W_PART(0.8)); + h = QUOTE(H_PART(0.9)); + sizeEx = QUOTE(H_PART(0.7)); }; class Total_Count: RscText { style = 2; shadow = 0; idc = IDC_WIDGET_TOTAL; text = ""; - x = W_PART(5.1); - y = H_PART(2.5); - w = W_PART(0.8); - h = H_PART(0.9); - sizeEx = H_PART(0.7); + x = QUOTE(W_PART(5.1)); + y = QUOTE(H_PART(2.5)); + w = QUOTE(W_PART(0.8)); + h = QUOTE(H_PART(0.9)); + sizeEx = QUOTE(H_PART(0.7)); }; class WeaponPicture: RscPictureKeepAspect { idc = IDC_WIDGET_WEAPON; text = ""; - x = W_PART(6.2); - y = H_PART(1.6); - w = W_PART(5.8); - h = H_PART(1.8); + x = QUOTE(W_PART(6.2)); + y = QUOTE(H_PART(1.6)); + w = QUOTE(W_PART(5.8)); + h = QUOTE(H_PART(1.8)); }; class ThrowablePicture: RscPictureKeepAspect { idc = IDC_WIDGET_THROWABLE; text = ""; - x = W_PART(12.3); - y = H_PART(1.6); - w = W_PART(1.8); - h = H_PART(1.8); + x = QUOTE(W_PART(12.3)); + y = QUOTE(H_PART(1.6)); + w = QUOTE(W_PART(1.8)); + h = QUOTE(H_PART(1.8)); }; }; }; diff --git a/addons/spottingscope/CfgWeapons.hpp b/addons/spottingscope/CfgWeapons.hpp index 2949920602..ac62572b30 100644 --- a/addons/spottingscope/CfgWeapons.hpp +++ b/addons/spottingscope/CfgWeapons.hpp @@ -25,11 +25,11 @@ class CfgWeapons { reticleDetailTextures[] = { // start at > this magnification, reticleTexture, reticleTextureSize, reticleTextureNight (optional) - {0, PATHTOF(data\ace_spottingscope_reticle_b1_ca.paa), 1, PATHTOF(data\ace_spottingscope_reticle_b1_ca.paa)}, - {9, PATHTOF(data\ace_spottingscope_reticle_b2_ca.paa), 1/2, PATHTOF(data\ace_spottingscope_reticle_b2_ca.paa)}, - {14, PATHTOF(data\ace_spottingscope_reticle_b3_ca.paa), 1/3, PATHTOF(data\ace_spottingscope_reticle_b3_ca.paa)}, - {19, PATHTOF(data\ace_spottingscope_reticle_b4_ca.paa), 1/4, PATHTOF(data\ace_spottingscope_reticle_b4_ca.paa)}, - {24, PATHTOF(data\ace_spottingscope_reticle_b5_ca.paa), 1/5, PATHTOF(data\ace_spottingscope_reticle_b5_ca.paa)} + {0, QPATHTOF(data\ace_spottingscope_reticle_b1_ca.paa), 1, QPATHTOF(data\ace_spottingscope_reticle_b1_ca.paa)}, + {9, QPATHTOF(data\ace_spottingscope_reticle_b2_ca.paa), "1/2", QPATHTOF(data\ace_spottingscope_reticle_b2_ca.paa)}, + {14, QPATHTOF(data\ace_spottingscope_reticle_b3_ca.paa), "1/3", QPATHTOF(data\ace_spottingscope_reticle_b3_ca.paa)}, + {19, QPATHTOF(data\ace_spottingscope_reticle_b4_ca.paa), "1/4", QPATHTOF(data\ace_spottingscope_reticle_b4_ca.paa)}, + {24, QPATHTOF(data\ace_spottingscope_reticle_b5_ca.paa), "1/5", QPATHTOF(data\ace_spottingscope_reticle_b5_ca.paa)} }; fadeReticleInterval[] = {10.5,9.5}; diff --git a/addons/switchunits/CfgVehicles.hpp b/addons/switchunits/CfgVehicles.hpp index bb07eb541c..74d51db44e 100644 --- a/addons/switchunits/CfgVehicles.hpp +++ b/addons/switchunits/CfgVehicles.hpp @@ -4,7 +4,7 @@ class CfgVehicles { author = ECSTRING(common,ACETeam); category = "ACE"; displayName = CSTRING(DisplayName); - function = FUNC(module); + function = QFUNC(module); scope = 1; isGlobal = 1; icon = QPATHTOF(UI\Icon_Module_SwitchUnits_ca.paa); diff --git a/addons/tagging/ACE_Tags.hpp b/addons/tagging/ACE_Tags.hpp index 1c739897ba..ce4df78f51 100644 --- a/addons/tagging/ACE_Tags.hpp +++ b/addons/tagging/ACE_Tags.hpp @@ -4,7 +4,7 @@ requiredItem = QUOTE(GLUE(ACE_Spraypaint,col)); \ textures[] = {QPATHTOF(UI\tags\col\name.paa)}; \ icon = QPATHTOF(UI\tags\col\name.paa); \ - } \ + } class ACE_Tags { class ACE_XBlack { @@ -53,7 +53,7 @@ class ACE_Tags { TAG(square,Blue); TAG(triangle,Blue); TAG(triangle_inverted,Blue); - + TAG(arrow_up,Green); TAG(arrow_down,Green); TAG(arrow_left,Green); diff --git a/addons/ui/RscInGameUI.hpp b/addons/ui/RscInGameUI.hpp index a3e7d2263a..541bb9f43e 100644 --- a/addons/ui/RscInGameUI.hpp +++ b/addons/ui/RscInGameUI.hpp @@ -2,16 +2,22 @@ #define SPEED_INDICATOR_H (IGUI_GRID_STANCE_HAbs / 3.5) #define SPEED_INDICATOR_Y_OFFSET (IGUI_GRID_STANCE_HAbs / 4.25) +#undef IGUI_GRID_STANCE_X +#undef IGUI_GRID_STANCE_Y +#define ace_IGUI_GRID_STANCE_X (profilenamespace getvariable ['IGUI_GRID_STANCE_X',IGUI_GRID_STANCE_XDef]) +#define ace_IGUI_GRID_STANCE_Y (profilenamespace getvariable ['IGUI_GRID_STANCE_Y',IGUI_GRID_STANCE_YDef]) + class RscPictureKeepAspect; class RscInGameUI { class RscStanceInfo { controls[] += {QGVAR(speedIndicator)}; class GVAR(speedIndicator): RscPictureKeepAspect { onLoad = QUOTE(uiNamespace setVariable [ARR_2(QQGVAR(speedIndicator),_this select 0)]); - x = IGUI_GRID_STANCE_X + IGUI_GRID_STANCE_WAbs / 2 - SPEED_INDICATOR_W / 2; - y = IGUI_GRID_STANCE_Y + IGUI_GRID_STANCE_HAbs - SPEED_INDICATOR_Y_OFFSET; - w = SPEED_INDICATOR_W; - h = SPEED_INDICATOR_H; + test = QUOTE(ace_IGUI_GRID_STANCE_X); + x = QUOTE(ace_IGUI_GRID_STANCE_X + IGUI_GRID_STANCE_WAbs / 2 - SPEED_INDICATOR_W / 2); + y = QUOTE(ace_IGUI_GRID_STANCE_Y + IGUI_GRID_STANCE_HAbs - SPEED_INDICATOR_Y_OFFSET); + w = QUOTE(SPEED_INDICATOR_W); + h = QUOTE(SPEED_INDICATOR_H); }; }; }; diff --git a/addons/vector/CfgWeapons.hpp b/addons/vector/CfgWeapons.hpp index 12c6efdaf9..f1a8db5482 100644 --- a/addons/vector/CfgWeapons.hpp +++ b/addons/vector/CfgWeapons.hpp @@ -7,8 +7,8 @@ class CfgWeapons { model = QPATHTOF(ace_vector.p3d); picture = QPATHTOF(UI\ace_vector_x_ca.paa); visionMode[] = {"Normal","NVG"}; - opticsZoomMax = 0.25/7; - opticsZoomMin = 0.25/7; + opticsZoomMax = "0.25/7"; + opticsZoomMin = "0.25/7"; modelOptics = "\A3\Weapons_F\empty.p3d"; class CBA_ScriptedOptic { diff --git a/addons/vehicles/CfgVehicles.hpp b/addons/vehicles/CfgVehicles.hpp index 4bd65cd52f..ec2ac69bd0 100644 --- a/addons/vehicles/CfgVehicles.hpp +++ b/addons/vehicles/CfgVehicles.hpp @@ -69,15 +69,15 @@ class CfgVehicles { }; class APC_Tracked_01_base_F: Tank_F { - fuelCapacity = 500 * FUEL_FACTOR; + fuelCapacity = QUOTE(500 * FUEL_FACTOR); }; class APC_Tracked_02_base_F: Tank_F { - fuelCapacity = 600 * FUEL_FACTOR; // NO FUCKING DATA + fuelCapacity = QUOTE(600 * FUEL_FACTOR); // NO FUCKING DATA }; class APC_Tracked_03_base_F: Tank_F { - fuelCapacity = 660 * FUEL_FACTOR; + fuelCapacity = QUOTE(660 * FUEL_FACTOR); class Turrets: Turrets { class MainTurret: MainTurret { weapons[] = {"autocannon_30mm","ACE_LMG_coax_L94A1_mem3"}; // Base 1.82: "autocannon_30mm","LMG_coax" @@ -86,7 +86,7 @@ class CfgVehicles { }; class MBT_03_base_F: Tank_F { - fuelCapacity = 550 * FUEL_FACTOR; + fuelCapacity = QUOTE(550 * FUEL_FACTOR); class Turrets: Turrets { class MainTurret: MainTurret { weapons[] = {"cannon_120mm_long","ACE_LMG_coax_MAG58_mem3"}; // Base 1.82: "cannon_120mm_long","LMG_coax" @@ -95,7 +95,7 @@ class CfgVehicles { }; class MBT_01_base_F: Tank_F { - fuelCapacity = 500 * FUEL_FACTOR; + fuelCapacity = QUOTE(500 * FUEL_FACTOR); class Turrets: Turrets { class MainTurret: MainTurret { weapons[] = {"cannon_120mm", "ACE_LMG_coax_MAG58_mem3"}; // Base 1.82: "cannon_120mm","LMG_coax" @@ -116,7 +116,7 @@ class CfgVehicles { class MBT_02_base_F: Tank_F { - fuelCapacity = 600 * FUEL_FACTOR; // again, couldn't find proper data + fuelCapacity = QUOTE(600 * FUEL_FACTOR); // again, couldn't find proper data }; @@ -148,15 +148,15 @@ class CfgVehicles { class Truck_F: Car_F {}; class MRAP_01_base_F: Car_F { - fuelCapacity = 510 * FUEL_FACTOR; + fuelCapacity = QUOTE(510 * FUEL_FACTOR); }; class MRAP_02_base_F: Car_F { - fuelCapacity = 500 * FUEL_FACTOR; // couldn't find any data for the punisher + fuelCapacity = QUOTE(500 * FUEL_FACTOR); // couldn't find any data for the punisher }; class MRAP_03_base_F: Car_F { - fuelCapacity = 860 * FUEL_FACTOR; + fuelCapacity = QUOTE(860 * FUEL_FACTOR); smokeLauncherGrenadeCount = 3; smokeLauncherAngle = 80; class Turrets: Turrets { @@ -187,19 +187,19 @@ class CfgVehicles { }; class Truck_01_base_F: Truck_F { - fuelCapacity = 644 * FUEL_FACTOR; + fuelCapacity = QUOTE(644 * FUEL_FACTOR); }; class Truck_02_base_F: Truck_F { - fuelCapacity = 1100 * FUEL_FACTOR; + fuelCapacity = QUOTE(1100 * FUEL_FACTOR); }; class Truck_03_base_F: Truck_F { - fuelCapacity = 900 * FUEL_FACTOR; // NO. FUCKING. DATA. + fuelCapacity = QUOTE(900 * FUEL_FACTOR); // NO. FUCKING. DATA. }; class APC_Wheeled_01_base_F: Wheeled_APC_F { - fuelCapacity = 800 * FUEL_FACTOR; + fuelCapacity = QUOTE(800 * FUEL_FACTOR); class Turrets: Turrets { class MainTurret: MainTurret {}; }; @@ -214,11 +214,11 @@ class CfgVehicles { }; class APC_Wheeled_02_base_F: Wheeled_APC_F { - fuelCapacity = 700 * FUEL_FACTOR; + fuelCapacity = QUOTE(700 * FUEL_FACTOR); }; class APC_Wheeled_03_base_F: Wheeled_APC_F { - fuelCapacity = 700 * FUEL_FACTOR; + fuelCapacity = QUOTE(700 * FUEL_FACTOR); class Turrets: Turrets { class MainTurret: MainTurret {}; }; diff --git a/addons/weather/RscTitles.hpp b/addons/weather/RscTitles.hpp index d89c8d0671..4b338f87cc 100644 --- a/addons/weather/RscTitles.hpp +++ b/addons/weather/RscTitles.hpp @@ -17,7 +17,7 @@ class RscTitles { x="SafeZoneX + 0.001"; y="SafeZoneY + 0.001"; w=0.2; - h=0.2*4/3; + h="0.2*4/3"; size=0.034; sizeEx=0.027; text=""; diff --git a/addons/xm157/CfgSounds.hpp b/addons/xm157/CfgSounds.hpp index 907e710bba..6b9b81496b 100644 --- a/addons/xm157/CfgSounds.hpp +++ b/addons/xm157/CfgSounds.hpp @@ -1,6 +1,6 @@ class CfgSounds { class GVAR(click) { - sound[] = {QPATHTOF(sounds\click.wav), db-30, 3}; + sound[] = {QPATHTOF(sounds\click.wav), "db-30", 3}; titles[] = {}; }; }; diff --git a/addons/xm157/RscInGameUI.hpp b/addons/xm157/RscInGameUI.hpp index 4e43e1581a..f08e79d451 100644 --- a/addons/xm157/RscInGameUI.hpp +++ b/addons/xm157/RscInGameUI.hpp @@ -10,14 +10,14 @@ class GVAR(text): RscText { }; class GVAR(textMenu): GVAR(text) { SizeEx = 0.09; - style = 2+16; + style = "2+16"; }; class RscInGameUI { class CBA_ScriptedOptic_zooming; class GVAR(info): CBA_ScriptedOptic_zooming { onLoad = QUOTE(call FUNC(weaponInfo_onLoad)); - class objects { + class objects { class Optic: RscObject { // first focal plane idc = IDC_SCOPE_OBJECT; type = 82; @@ -40,7 +40,7 @@ class RscInGameUI { x = 0; y = 0; w = 1; - h = 4/3; + h = "4/3"; }; }; }; @@ -68,7 +68,7 @@ class RscInGameUI { x = 0; y = 0; w = 1; - h = 4/3; + h = "4/3"; }; }; }; diff --git a/addons/yardage450/CfgWeapons.hpp b/addons/yardage450/CfgWeapons.hpp index 382a6d09fc..9d9bcb4ecf 100644 --- a/addons/yardage450/CfgWeapons.hpp +++ b/addons/yardage450/CfgWeapons.hpp @@ -8,12 +8,12 @@ class CfgWeapons { model = QPATHTOF(data\ace_yardage_pro_450.p3d); modelOptics = QPATHTOF(data\bushnell_optic.p3d); picture = QPATHTOF(UI\w_bushnell_ca.paa); - opticsZoomMin = 0.33333/4; - opticsZoomMax = 0.33333/4; - opticsZoomInit = 0.33333/4; + opticsZoomMin = "0.33333/4"; + opticsZoomMax = "0.33333/4"; + opticsZoomInit = "0.33333/4"; distanceZoomMin = 400; distanceZoomMax = 400; - discretefov[] = {0.33333/4}; + discretefov[] = {"0.33333/4"}; discreteInitIndex = 0; visionMode[] = {"Normal"}; class WeaponSlotsInfo { diff --git a/addons/zeus/ui/RscAttributes.hpp b/addons/zeus/ui/RscAttributes.hpp index 1174267466..b72221d354 100644 --- a/addons/zeus/ui/RscAttributes.hpp +++ b/addons/zeus/ui/RscAttributes.hpp @@ -29,25 +29,25 @@ class GVAR(AttributeRadius): RscControlsGroupNoScrollbars { idc = 26466; x = 0; y = 0; - w = W_PART(26); - h = H_PART(1.1); + w = QUOTE(W_PART(26)); + h = QUOTE(H_PART(1.1)); class controls { class Label: RscText { idc = -1; text = CSTRING(AttributeRadius); tooltip = CSTRING(AttributeRadius_Tooltip); x = 0; - y = H_PART(0.1); - w = W_PART(10); - h = H_PART(1); + y = QUOTE(H_PART(0.1)); + w = QUOTE(W_PART(10)); + h = QUOTE(H_PART(1)); colorBackground[] = {0, 0, 0, 0.5}; }; class Radius: RscEdit { idc = 26467; - x = W_PART(10.1); - y = H_PART(0.1); - w = W_PART(15.9); - h = H_PART(1); + x = QUOTE(W_PART(10.1)); + y = QUOTE(H_PART(0.1)); + w = QUOTE(W_PART(15.9)); + h = QUOTE(H_PART(1)); autocomplete = ""; }; }; @@ -85,8 +85,8 @@ class GVAR(RscEditableObjects): RscDisplayAttributes { idc = 19180; x = 0; y = 0; - w = W_PART(26); - h = H_PART(3.2); + w = QUOTE(W_PART(26)); + h = QUOTE(H_PART(3.2)); class controls { class EditingModeLabel: RscText { idc = -1; @@ -94,16 +94,16 @@ class GVAR(RscEditableObjects): RscDisplayAttributes { tooltip = CSTRING(ModuleEditableObjects_EditingMode_Tooltip); x = 0; y = 0; - w = W_PART(10); - h = H_PART(1); + w = QUOTE(W_PART(10)); + h = QUOTE(H_PART(1)); colorBackground[] = {0, 0, 0, 0.5}; }; class EditingMode: ctrlToolbox { idc = 19181; - x = W_PART(10.1); + x = QUOTE(W_PART(10.1)); y = 0; - w = W_PART(15.9); - h = H_PART(1); + w = QUOTE(W_PART(15.9)); + h = QUOTE(H_PART(1)); rows = 1; columns = 2; strings[] = {CSTRING(ModuleEditableObjects_RemoveObjects), CSTRING(ModuleEditableObjects_AddObjects)}; @@ -111,21 +111,21 @@ class GVAR(RscEditableObjects): RscDisplayAttributes { class AllCuratorsLabel: EditingModeLabel { text = CSTRING(ModuleEditableObjects_AllCurators); tooltip = CSTRING(ModuleEditableObjects_AllCurators_Tooltip); - y = H_PART(1.1); + y = QUOTE(H_PART(1.1)); }; class AllCurators: EditingMode { idc = 19182; - y = H_PART(1.1); + y = QUOTE(H_PART(1.1)); strings[] = {ECSTRING(common,No), ECSTRING(common,Yes)}; }; class AdditionalObjectsLabel: EditingModeLabel { text = CSTRING(ModuleEditableObjects_AdditionalObjects); tooltip = CSTRING(ModuleEditableObjects_AdditionalObjects_Tooltip); - y = H_PART(2.2); + y = QUOTE(H_PART(2.2)); }; class AdditionalObjects: EditingMode { idc = 19183; - y = H_PART(2.2); + y = QUOTE(H_PART(2.2)); columns = 3; strings[] = {CSTRING(None), CSTRING(Players), CSTRING(PlayersAndAI)}; }; @@ -151,8 +151,8 @@ class GVAR(RscGlobalSetSkill): RscDisplayAttributes { idc = 26422; x = 0; y = 0; - w = W_PART(26); - h = H_PART(6.5); + w = QUOTE(W_PART(26)); + h = QUOTE(H_PART(6.5)); class controls { class Title1: RscText { idc = -1; @@ -160,69 +160,69 @@ class GVAR(RscGlobalSetSkill): RscDisplayAttributes { toolTip = CSTRING(ModuleGlobalSetSkill_general_desc); x = 0; y = 0; - w = W_PART(10); - h = H_PART(1); + w = QUOTE(W_PART(10)); + h = QUOTE(H_PART(1)); colorBackground[] = {0,0,0,0.5}; }; class General: RscXSliderH { idc = 16184; - x = W_PART(10.1); + x = QUOTE(W_PART(10.1)); y = 0; - w = W_PART(15.9); - h = H_PART(1); + w = QUOTE(W_PART(15.9)); + h = QUOTE(H_PART(1)); }; class Title2: Title1 { idc = -1; text = CSTRING(ModuleGlobalSetSkill_accuracy); toolTip = CSTRING(ModuleGlobalSetSkill_accuracy_desc); - y = H_PART(1.1); + y = QUOTE(H_PART(1.1)); }; class Accuracy: General { idc = 16185; - y = H_PART(1.1); + y = QUOTE(H_PART(1.1)); }; class Title3: Title1 { idc = -1; text = CSTRING(ModuleGlobalSetSkill_handling); toolTip = CSTRING(ModuleGlobalSetSkill_handling_desc); - y = H_PART(2.2); + y = QUOTE(H_PART(2.2)); }; class Handling: General { idc = 16186; - y = H_PART(2.2); + y = QUOTE(H_PART(2.2)); }; class Title4: Title1 { idc = -1; text = CSTRING(ModuleGlobalSetSkill_spotting); toolTip = CSTRING(ModuleGlobalSetSkill_spotting_desc); - y = H_PART(3.3); + y = QUOTE(H_PART(3.3)); }; class Spotting: General { idc = 16187; - y = H_PART(3.3); + y = QUOTE(H_PART(3.3)); }; class Title5: Title1 { idc = -1; text = CSTRING(ModuleGlobalSetSkill_cover); toolTip = CSTRING(ModuleGlobalSetSkill_cover_desc); - y = H_PART(4.4); + y = QUOTE(H_PART(4.4)); }; class Cover: RscCheckBox { idc = 16188; - x = W_PART(10.1); - y = H_PART(4.4); - w = W_PART(1); - h = H_PART(1); + x = QUOTE(W_PART(10.1)); + y = QUOTE(H_PART(4.4)); + w = QUOTE(W_PART(1)); + h = QUOTE(H_PART(1)); }; class Title6: Title5 { idc = -1; text = CSTRING(ModuleGlobalSetSkill_combat); toolTip = CSTRING(ModuleGlobalSetSkill_combat_desc); - y = H_PART(5.5); + y = QUOTE(H_PART(5.5)); }; class Combat: Cover { idc = 16189; - y = H_PART(5.5); + y = QUOTE(H_PART(5.5)); }; }; }; @@ -246,60 +246,60 @@ class GVAR(RscGroupSide): RscDisplayAttributes { idc = 26422; x = 0; y = 0; - w = W_PART(26); - h = H_PART(2.5); + w = QUOTE(W_PART(26)); + h = QUOTE(H_PART(2.5)); class controls { class Title: RscText { idc = 31002; text = "$STR_disp_arcunit_side"; x = 0; y = 0; - w = W_PART(10); - h = H_PART(2.5); + w = QUOTE(W_PART(10)); + h = QUOTE(H_PART(2.5)); colorBackground[] = {0,0,0,0.5}; }; class Background: RscText { idc = 31000; - x = W_PART(10); + x = QUOTE(W_PART(10)); y = 0; - w = W_PART(16); - h = H_PART(2.5); + w = QUOTE(W_PART(16)); + h = QUOTE(H_PART(2.5)); colorBackground[] = {1,1,1,0.1}; }; class BLUFOR: RscActivePicture { idc = 31200; text = "\a3\Ui_F_Curator\Data\Displays\RscDisplayCurator\side_west_ca.paa"; - x = W_PART(12.5); - y = H_PART(0.25); - w = W_PART(2); - h = H_PART(2); + x = QUOTE(W_PART(12.5)); + y = QUOTE(H_PART(0.25)); + w = QUOTE(W_PART(2)); + h = QUOTE(H_PART(2)); tooltip = "$STR_WEST"; }; class OPFOR: BLUFOR { idc = 31201; text = "\a3\Ui_F_Curator\Data\Displays\RscDisplayCurator\side_east_ca.paa"; - x = W_PART(15.5); - y = H_PART(0.25); - w = W_PART(2); - h = H_PART(2); + x = QUOTE(W_PART(15.5)); + y = QUOTE(H_PART(0.25)); + w = QUOTE(W_PART(2)); + h = QUOTE(H_PART(2)); tooltip = "$STR_EAST"; }; class Independent: BLUFOR { idc = 31202; text = "\a3\Ui_F_Curator\Data\Displays\RscDisplayCurator\side_guer_ca.paa"; - x = W_PART(18.5); - y = H_PART(0.25); - w = W_PART(2); - h = H_PART(2); + x = QUOTE(W_PART(18.5)); + y = QUOTE(H_PART(0.25)); + w = QUOTE(W_PART(2)); + h = QUOTE(H_PART(2)); tooltip = "$STR_guerrila"; }; class Civilian: BLUFOR { idc = 31203; text = "\a3\Ui_F_Curator\Data\Displays\RscDisplayCurator\side_civ_ca.paa"; - x = W_PART(21.5); - y = H_PART(0.25); - w = W_PART(2); - h = H_PART(2); + x = QUOTE(W_PART(21.5)); + y = QUOTE(H_PART(0.25)); + w = QUOTE(W_PART(2)); + h = QUOTE(H_PART(2)); tooltip = "$STR_Civilian"; }; }; @@ -360,8 +360,8 @@ class GVAR(RscTeleportPlayers): RscDisplayAttributes { idc = 26422; x = 0; y = 0; - w = W_PART(26); - h = H_PART(8.1); + w = QUOTE(W_PART(26)); + h = QUOTE(H_PART(8.1)); class controls { class Title: RscText { idc = -1; @@ -369,55 +369,55 @@ class GVAR(RscTeleportPlayers): RscDisplayAttributes { toolTip = CSTRING(ModuleTeleportPlayers_player_desc); x = 0; y = 0; - w = W_PART(26); - h = H_PART(1); + w = QUOTE(W_PART(26)); + h = QUOTE(H_PART(1)); colorBackground[] = {0, 0, 0, 0.5}; }; class Unit: RscListbox { idc = 16189; x = 0; - y = H_PART(1.1); - w = W_PART(26); - h = H_PART(5.9); + y = QUOTE(H_PART(1.1)); + w = QUOTE(W_PART(26)); + h = QUOTE(H_PART(5.9)); }; class SearchBackground: RscText { idc = -1; x = 0; - y = H_PART(7.1); - w = W_PART(1); - h = H_PART(1); + y = QUOTE(H_PART(7.1)); + w = QUOTE(W_PART(1)); + h = QUOTE(H_PART(1)); colorBackground[] = {0, 0, 0, 0.5}; }; class SearchPicture: RscPicture { idc = -1; text = "\a3\Ui_f\data\GUI\RscCommon\RscButtonSearch\search_start_ca.paa"; x = 0; - y = H_PART(7.1); - w = W_PART(1); - h = H_PART(1); + y = QUOTE(H_PART(7.1)); + w = QUOTE(W_PART(1)); + h = QUOTE(H_PART(1)); }; class Search: RscEdit { idc = 16190; - x = W_PART(1.2); - y = H_PART(7.1); - w = W_PART(14.5); - h = H_PART(1); + x = QUOTE(W_PART(1.2)); + y = QUOTE(H_PART(7.1)); + w = QUOTE(W_PART(14.5)); + h = QUOTE(H_PART(1)); autocomplete = ""; }; class LabelGroup: Title { idc = -1; text = CSTRING(ModuleTeleportPlayers_group); toolTip = CSTRING(ModuleTeleportPlayers_group_desc); - x = W_PART(15.9); - y = H_PART(7.1); - w = W_PART(9); + x = QUOTE(W_PART(15.9)); + y = QUOTE(H_PART(7.1)); + w = QUOTE(W_PART(9)); }; class UseGroup: RscCheckBox { idc = 16188; - x = W_PART(25); - y = H_PART(7.1); - w = W_PART(1); - h = H_PART(1); + x = QUOTE(W_PART(25)); + y = QUOTE(H_PART(7.1)); + w = QUOTE(W_PART(1)); + h = QUOTE(H_PART(1)); }; }; }; @@ -431,42 +431,42 @@ class GVAR(RscTeleportPlayers): RscDisplayAttributes { class GVAR(AttributeCargo): RscControlsGroupNoScrollbars { onSetFocus = QUOTE(_this call FUNC(ui_attributeCargo)); idc = -1; - x = X_PART(7); - y = Y_PART(10); - w = W_PART(26); - h = H_PART(3); + x = QUOTE(X_PART(7)); + y = QUOTE(Y_PART(10)); + w = QUOTE(W_PART(26)); + h = QUOTE(H_PART(3)); class controls { class Title: RscText { idc = -1; text = CSTRING(AttributeCargo); x = 0; y = 0; - w = W_PART(10); - h = H_PART(2); + w = QUOTE(W_PART(10)); + h = QUOTE(H_PART(2)); colorBackground[] = {0,0,0,0.5}; }; class Background: RscText { idc = -1; - x = W_PART(10); + x = QUOTE(W_PART(10)); y = 0; - w = W_PART(16); - h = H_PART(3); + w = QUOTE(W_PART(16)); + h = QUOTE(H_PART(3)); colorBackground[] = {1,1,1,0.1}; }; class Cargo: RscListBox { idc = 80086; - x = W_PART(10); + x = QUOTE(W_PART(10)); y = 0; - w = W_PART(16); - h = H_PART(3); + w = QUOTE(W_PART(16)); + h = QUOTE(H_PART(3)); }; class Unload: RscButton { idc = 80087; text = ECSTRING(cargo,unloadObject); x = 0; - y = H_PART(2); - w = W_PART(10); - h = H_PART(1); + y = QUOTE(H_PART(2)); + w = QUOTE(W_PART(10)); + h = QUOTE(H_PART(1)); colorBackground[] = {0, 0, 0, 0.7}; }; }; @@ -506,24 +506,24 @@ class GVAR(RscGarrison): RscDisplayAttributes { idc = 73060; x = 0; y = 0; - w = W_PART(26); - h = H_PART(6.2); + w = QUOTE(W_PART(26)); + h = QUOTE(H_PART(6.2)); class controls { class TeleportLabel: RscText { idc = -1; text = CSTRING(ModuleGarrison_TeleportText); x = 0; y = 0; - w = W_PART(10); - h = H_PART(1); + w = QUOTE(W_PART(10)); + h = QUOTE(H_PART(1)); colorBackground[] = {0, 0, 0, 0.5}; }; class Teleport: ctrlToolbox { idc = 73061; - x = W_PART(10.1); + x = QUOTE(W_PART(10.1)); y = 0; - w = W_PART(15.9); - h = H_PART(1); + w = QUOTE(W_PART(15.9)); + h = QUOTE(H_PART(1)); rows = 1; columns = 2; strings[] = {ECSTRING(common,No), ECSTRING(common,Yes)}; @@ -531,23 +531,23 @@ class GVAR(RscGarrison): RscDisplayAttributes { class TopDownLabel: TeleportLabel { text = CSTRING(ModuleGarrison_TopDownFillingText); tooltip = CSTRING(ModuleGarrison_TopDownFillingTooltip); - y = H_PART(1.1); + y = QUOTE(H_PART(1.1)); }; class TopDown: Teleport { idc = 73062; - y = H_PART(1.1); + y = QUOTE(H_PART(1.1)); }; class FillingModeLabel: TeleportLabel { text = CSTRING(ModuleGarrison_FillingModeText); - y = H_PART(2.2); - w = W_PART(26); + y = QUOTE(H_PART(2.2)); + w = QUOTE(W_PART(26)); }; class FillingMode: RscListbox { idc = 73063; x = 0; - y = H_PART(3.2); - w = W_PART(26); - h = H_PART(3); + y = QUOTE(H_PART(3.2)); + w = QUOTE(W_PART(26)); + h = QUOTE(H_PART(3)); class Items { class Even { text = CSTRING(ModuleGarrison_FillingModeEven); @@ -583,8 +583,8 @@ class GVAR(RscToggleNvg): RscDisplayAttributes { idc = 92854; x = 0; y = 0; - w = W_PART(26); - h = H_PART(2.1); + w = QUOTE(W_PART(26)); + h = QUOTE(H_PART(2.1)); class controls { class ToggleLabel: RscText { idc = -1; @@ -592,16 +592,16 @@ class GVAR(RscToggleNvg): RscDisplayAttributes { tooltip = CSTRING(ModuleToggleNVG_NvgEquipment_tooltip); x = 0; y = 0; - w = W_PART(10); - h = H_PART(1); + w = QUOTE(W_PART(10)); + h = QUOTE(H_PART(1)); colorBackground[] = {0, 0, 0, 0.5}; }; class Toggle: ctrlToolbox { idc = 92855; - x = W_PART(10.1); + x = QUOTE(W_PART(10.1)); y = 0; - w = W_PART(15.9); - h = H_PART(1); + w = QUOTE(W_PART(15.9)); + h = QUOTE(H_PART(1)); rows = 1; columns = 2; strings[] = {ECSTRING(common,Disabled), ECSTRING(common,Enabled)}; @@ -609,14 +609,14 @@ class GVAR(RscToggleNvg): RscDisplayAttributes { class TargetLabel: ToggleLabel { text = CSTRING(ToggleTarget); tooltip = CSTRING(ToggleTarget_Tooltip); - y = H_PART(1.1); + y = QUOTE(H_PART(1.1)); }; class Target: RscCombo { idc = 92856; - x = W_PART(10.1); - y = H_PART(1.1); - w = W_PART(15.9); - h = H_PART(1); + x = QUOTE(W_PART(10.1)); + y = QUOTE(H_PART(1.1)); + w = QUOTE(W_PART(15.9)); + h = QUOTE(H_PART(1)); colorBackground[] = {0, 0, 0, 0.7}; class Items { class Group { @@ -664,48 +664,48 @@ class GVAR(RscToggleFlashlight): RscDisplayAttributes { idc = 56217; x = 0; y = 0; - w = W_PART(26); - h = H_PART(3.2); + w = QUOTE(W_PART(26)); + h = QUOTE(H_PART(3.2)); class controls { class ToggleLabel: RscText { idc = -1; text = CSTRING(ModuleToggleFlashlight_Flashlights); x = 0; y = 0; - w = W_PART(10); - h = H_PART(1); + w = QUOTE(W_PART(10)); + h = QUOTE(H_PART(1)); colorBackground[] = {0, 0, 0, 0.5}; }; class Toggle: ctrlToolbox { idc = 56218; - x = W_PART(10.1); + x = QUOTE(W_PART(10.1)); y = 0; - w = W_PART(15.9); - h = H_PART(1); + w = QUOTE(W_PART(15.9)); + h = QUOTE(H_PART(1)); rows = 1; columns = 2; strings[] = {ECSTRING(common,Disabled), ECSTRING(common,Enabled)}; }; class AddGearLabel: ToggleLabel { text = CSTRING(ModuleToggleFlashlight_AddGear); - y = H_PART(1.1); + y = QUOTE(H_PART(1.1)); }; class AddGear: Toggle { idc = 56219; - y = H_PART(1.1); + y = QUOTE(H_PART(1.1)); strings[] = {ECSTRING(common,No), ECSTRING(common,Yes)}; }; class TargetLabel: ToggleLabel { text = CSTRING(ToggleTarget); tooltip = CSTRING(ToggleTarget_Tooltip); - y = H_PART(2.2); + y = QUOTE(H_PART(2.2)); }; class Target: RscCombo { idc = 56220; - x = W_PART(10.1); - y = H_PART(2.2); - w = W_PART(15.9); - h = H_PART(1); + x = QUOTE(W_PART(10.1)); + y = QUOTE(H_PART(2.2)); + w = QUOTE(W_PART(15.9)); + h = QUOTE(H_PART(1)); colorBackground[] = {0, 0, 0, 0.7}; class Items { class Group { @@ -753,25 +753,25 @@ class GVAR(RscSetEngineer): RscDisplayAttributes { idc = 86946; x = 0; y = 0; - w = W_PART(26); - h = H_PART(1.2); + w = QUOTE(W_PART(26)); + h = QUOTE(H_PART(1.2)); class controls { class Label: RscText { idc = -1; text = CSTRING(ModuleSetEngineer_skill); toolTip = ECSTRING(repair,AssignEngineerRole_role_Description); x = 0; - y = H_PART(0.1); - w = W_PART(10); - h = H_PART(1); + y = QUOTE(H_PART(0.1)); + w = QUOTE(W_PART(10)); + h = QUOTE(H_PART(1)); colorBackground[] = {0, 0, 0, 0.5}; }; class Roles: ctrlToolbox { idc = 86947; - x = W_PART(10.1); - y = H_PART(0.1); - w = W_PART(15.9); - h = H_PART(1); + x = QUOTE(W_PART(10.1)); + y = QUOTE(H_PART(0.1)); + w = QUOTE(W_PART(15.9)); + h = QUOTE(H_PART(1)); rows = 1; columns = 2; strings[] = {ECSTRING(repair,AssignEngineerRole_role_engineer), ECSTRING(repair,AssignEngineerRole_role_advanced)}; @@ -798,58 +798,58 @@ class GVAR(RscSuicideBomber): RscDisplayAttributes { idc = 83470; x = 0; y = 0; - w = W_PART(26); - h = H_PART(5.8); + w = QUOTE(W_PART(26)); + h = QUOTE(H_PART(5.8)); class controls { class ActivationSide: RscControlsGroupNoScrollbars { idc = 83571; x = 0; y = 0; - w = W_PART(26); - h = H_PART(2.5); + w = QUOTE(W_PART(26)); + h = QUOTE(H_PART(2.5)); class controls { class Label: RscText { idc = -1; text = CSTRING(ModuleSuicideBomber_ActivationSide); x = 0; y = 0; - w = W_PART(10); - h = H_PART(2.5); + w = QUOTE(W_PART(10)); + h = QUOTE(H_PART(2.5)); colorBackground[] = {0, 0, 0, 0.5}; }; class Background: RscText { idc = -1; - x = W_PART(10); + x = QUOTE(W_PART(10)); y = 0; - w = W_PART(16); - h = H_PART(2.5); + w = QUOTE(W_PART(16)); + h = QUOTE(H_PART(2.5)); colorBackground[] = {1, 1, 1, 0.1}; }; class BLUFOR: RscActivePicture { idc = 83581; text = "\a3\Ui_F_Curator\Data\Displays\RscDisplayCurator\side_west_ca.paa"; - x = W_PART(12.5); - y = H_PART(0.25); - w = W_PART(2); - h = H_PART(2); + x = QUOTE(W_PART(12.5)); + y = QUOTE(H_PART(0.25)); + w = QUOTE(W_PART(2)); + h = QUOTE(H_PART(2)); tooltip = "$STR_WEST"; }; class OPFOR: BLUFOR { idc = 83580; text = "\a3\Ui_F_Curator\Data\Displays\RscDisplayCurator\side_east_ca.paa"; - x = W_PART(15.5); + x = QUOTE(W_PART(15.5)); tooltip = "$STR_EAST"; }; class Independent: BLUFOR { idc = 83582; text = "\a3\Ui_F_Curator\Data\Displays\RscDisplayCurator\side_guer_ca.paa"; - x = W_PART(18.5); + x = QUOTE(W_PART(18.5)); tooltip = "$STR_guerrila"; }; class Civilian: BLUFOR { idc = 83583; text = "\a3\Ui_F_Curator\Data\Displays\RscDisplayCurator\side_civ_ca.paa"; - x = W_PART(21.5); + x = QUOTE(W_PART(21.5)); tooltip = "$STR_Civilian"; }; }; @@ -858,24 +858,24 @@ class GVAR(RscSuicideBomber): RscDisplayAttributes { idc = -1; text = CSTRING(ModuleSuicideBomber_ActivationRadius); x = 0; - y = H_PART(2.6); - w = W_PART(10); - h = H_PART(1); + y = QUOTE(H_PART(2.6)); + w = QUOTE(W_PART(10)); + h = QUOTE(H_PART(1)); colorBackground[] = {0, 0, 0, 0.5}; }; class DistanceSlider: RscXSliderH { idc = 83572; - x = W_PART(10.1); - y = H_PART(2.6); - w = W_PART(13.9); - h = H_PART(1); + x = QUOTE(W_PART(10.1)); + y = QUOTE(H_PART(2.6)); + w = QUOTE(W_PART(13.9)); + h = QUOTE(H_PART(1)); }; class DistanceEdit: RscEdit { idc = 83573; - x = W_PART(24.1); - y = H_PART(2.6); - w = W_PART(1.9); - h = H_PART(1); + x = QUOTE(W_PART(24.1)); + y = QUOTE(H_PART(2.6)); + w = QUOTE(W_PART(1.9)); + h = QUOTE(H_PART(1)); autocomplete = ""; maxChars = 3; canModify = 0; @@ -883,14 +883,14 @@ class GVAR(RscSuicideBomber): RscDisplayAttributes { class ExplosionLabel: DistanceLabel { idc = -1; text = CSTRING(ModuleSuicideBomber_ExplosionSize); - y = H_PART(3.7); + y = QUOTE(H_PART(3.7)); }; class Explosion: ctrlToolbox { idc = 83574; - x = W_PART(10.1); - y = H_PART(3.7); - w = W_PART(15.9); - h = H_PART(1); + x = QUOTE(W_PART(10.1)); + y = QUOTE(H_PART(3.7)); + w = QUOTE(W_PART(15.9)); + h = QUOTE(H_PART(1)); rows = 1; columns = 3; strings[] = {"$STR_small", "$STR_medium", "$STR_large"}; @@ -898,12 +898,12 @@ class GVAR(RscSuicideBomber): RscDisplayAttributes { class AutoSeekLabel: DistanceLabel { idc = -1; text = CSTRING(ModuleSuicideBomber_AutoSeek); - y = H_PART(4.8); + y = QUOTE(H_PART(4.8)); toolTip = CSTRING(ModuleSuicideBomber_AutoSeek_tooltip); }; class AutoSeek: Explosion { idc = 83575; - y = H_PART(4.8); + y = QUOTE(H_PART(4.8)); columns = 2; strings[] = {ECSTRING(common,Disabled), ECSTRING(common,Enabled)}; }; diff --git a/hemtt.toml b/hemtt.toml index d706162df8..a74a731e4a 100644 --- a/hemtt.toml +++ b/hemtt.toml @@ -1,26 +1,6 @@ -name = "ACE3" -prefix = "ace" -author = "ACE-Team" +[project] +name = "ACE 3" files = [ "*.dll", - "*.so", - "mod.cpp", - "README.md", - "docs/README_DE.md", - "docs/README_PL.md", - "docs/README.zh-TW.md", - "AUTHORS.txt", - "LICENSE", "logo_ace3_ca.paa", - "meta.cpp" ] - -keyname = "{{prefix}}_{{version}}" -signame = "{{prefix}}_{{version}}-{{git \"id 8\"}}" - -releasebuild = [ - "@zip ace3_{{semver.major}}.{{semver.minor}}.{{semver.patch}}" -] - -[header_exts] -version= "{{git \"id 8\"}}" diff --git a/include/a3/ui_f/hpp/defineCommonGrids.inc b/include/a3/ui_f/hpp/defineCommonGrids.inc index 777257255a..9574a6982c 100644 --- a/include/a3/ui_f/hpp/defineCommonGrids.inc +++ b/include/a3/ui_f/hpp/defineCommonGrids.inc @@ -461,4 +461,4 @@ #define GUI_GRID_OLD_AV_TERMINAL_W (safezoneW / 64) #define GUI_GRID_OLD_AV_TERMINAL_H (safezoneH / 40) #define GUI_GRID_OLD_AV_TERMINAL_WAbs (safezoneW) -#define GUI_GRID_OLD_AV_TERMINAL_HAbs (safezoneH) \ No newline at end of file +#define GUI_GRID_OLD_AV_TERMINAL_HAbs (safezoneH) diff --git a/optionals/realisticdispersion/CfgWeapons.hpp b/optionals/realisticdispersion/CfgWeapons.hpp index fc13ab0952..f97cd31f8a 100644 --- a/optionals/realisticdispersion/CfgWeapons.hpp +++ b/optionals/realisticdispersion/CfgWeapons.hpp @@ -9,287 +9,287 @@ class CfgWeapons { // GM6 Lynx class GM6_base_F: Rifle_Long_Base_F { class Single: Mode_SemiAuto { - dispersion = MOA_TO_RAD(0.45); + dispersion = QUOTE(MOA_TO_RAD(0.45)); }; }; // M200 Intervention class LRR_base_F: Rifle_Long_Base_F { class Single: Mode_SemiAuto { - dispersion = MOA_TO_RAD(0.50); + dispersion = QUOTE(MOA_TO_RAD(0.50)); }; }; // MX class arifle_MX_Base_F: Rifle_Base_F { class Single: Mode_SemiAuto { - dispersion = MOA_TO_RAD(0.90); + dispersion = QUOTE(MOA_TO_RAD(0.90)); }; class FullAuto: Mode_FullAuto { - dispersion = MOA_TO_RAD(0.90); + dispersion = QUOTE(MOA_TO_RAD(0.90)); }; }; // KH2002 Sama class arifle_katiba_Base_F: Rifle_Base_F { class Single: Mode_SemiAuto { - dispersion = MOA_TO_RAD(0.90); + dispersion = QUOTE(MOA_TO_RAD(0.90)); }; class FullAuto: Mode_FullAuto { - dispersion = MOA_TO_RAD(0.90); + dispersion = QUOTE(MOA_TO_RAD(0.90)); }; }; // CTAR-21 class Tavor_base_F: Rifle_Base_F { class Single: Mode_SemiAuto { - dispersion = MOA_TO_RAD(1.12); + dispersion = QUOTE(MOA_TO_RAD(1.12)); }; class FullAuto: Mode_FullAuto { - dispersion = MOA_TO_RAD(1.12); + dispersion = QUOTE(MOA_TO_RAD(1.12)); }; }; // F2000 class mk20_base_F: Rifle_Base_F { class Single: Mode_SemiAuto { - dispersion = MOA_TO_RAD(1.12); + dispersion = QUOTE(MOA_TO_RAD(1.12)); }; class FullAuto: Mode_FullAuto { - dispersion = MOA_TO_RAD(1.12); + dispersion = QUOTE(MOA_TO_RAD(1.12)); }; }; // Noreen "Bad News" ULR class DMR_02_base_F: Rifle_Long_Base_F { class Single: Mode_SemiAuto { - dispersion = MOA_TO_RAD(0.61); + dispersion = QUOTE(MOA_TO_RAD(0.61)); }; }; // VS-121 class DMR_01_base_F: Rifle_Long_Base_F { class Single: Mode_SemiAuto { - dispersion = MOA_TO_RAD(0.81); + dispersion = QUOTE(MOA_TO_RAD(0.81)); }; class FullAuto: Mode_FullAuto { - dispersion = MOA_TO_RAD(0.81); + dispersion = QUOTE(MOA_TO_RAD(0.81)); }; }; // Mk14 Mod 1 EBR class EBR_base_F: Rifle_Long_Base_F { class Single: Mode_SemiAuto { - dispersion = MOA_TO_RAD(0.81); + dispersion = QUOTE(MOA_TO_RAD(0.81)); }; class FullAuto: Mode_FullAuto { - dispersion = MOA_TO_RAD(0.81); + dispersion = QUOTE(MOA_TO_RAD(0.81)); }; }; // SIG 556 class DMR_03_base_F: Rifle_Long_Base_F { class Single: Mode_SemiAuto { - dispersion = MOA_TO_RAD(0.81); + dispersion = QUOTE(MOA_TO_RAD(0.81)); }; class FullAuto: Mode_FullAuto { - dispersion = MOA_TO_RAD(0.81); + dispersion = QUOTE(MOA_TO_RAD(0.81)); }; }; // ASP-1 Kir class DMR_04_base_F: Rifle_Long_Base_F { class Single: Mode_SemiAuto { - dispersion = MOA_TO_RAD(1.0); + dispersion = QUOTE(MOA_TO_RAD(1.0)); }; }; // Cyrus class DMR_05_base_F: Rifle_Long_Base_F { class Single: Mode_SemiAuto { - dispersion = MOA_TO_RAD(0.67); + dispersion = QUOTE(MOA_TO_RAD(0.67)); }; class FullAuto: Mode_FullAuto { - dispersion = MOA_TO_RAD(0.67); + dispersion = QUOTE(MOA_TO_RAD(0.67)); }; }; // M14 class DMR_06_base_F: Rifle_Long_Base_F { class Single: Mode_SemiAuto { - dispersion = MOA_TO_RAD(0.81); + dispersion = QUOTE(MOA_TO_RAD(0.81)); }; class FullAuto: Mode_FullAuto { - dispersion = MOA_TO_RAD(0.81); + dispersion = QUOTE(MOA_TO_RAD(0.81)); }; }; class DMR_06_hunter_base_F: DMR_06_base_F { class Single: Single { - dispersion = MOA_TO_RAD(0.81); + dispersion = QUOTE(MOA_TO_RAD(0.81)); }; }; // MX LSW class arifle_MX_SW_F: arifle_MX_Base_F { class Single: Mode_SemiAuto { - dispersion = MOA_TO_RAD(0.90); + dispersion = QUOTE(MOA_TO_RAD(0.90)); }; class FullAuto: Mode_FullAuto { - dispersion = MOA_TO_RAD(0.90); + dispersion = QUOTE(MOA_TO_RAD(0.90)); }; }; // MXM class arifle_MXM_F: arifle_MX_Base_F { class Single: Single { - dispersion = MOA_TO_RAD(0.90); + dispersion = QUOTE(MOA_TO_RAD(0.90)); }; class FullAuto: FullAuto { - dispersion = MOA_TO_RAD(0.90); + dispersion = QUOTE(MOA_TO_RAD(0.90)); }; }; // HK416A5 11" class arifle_SPAR_01_base_F: Rifle_Base_F { class Single: Mode_SemiAuto { - dispersion = MOA_TO_RAD(1.12); + dispersion = QUOTE(MOA_TO_RAD(1.12)); }; class FullAuto: Mode_FullAuto { - dispersion = MOA_TO_RAD(1.12); + dispersion = QUOTE(MOA_TO_RAD(1.12)); }; }; // HK416A5 14.5" class arifle_SPAR_02_base_F: Rifle_Base_F { class Single: Mode_SemiAuto { - dispersion = MOA_TO_RAD(1.12); + dispersion = QUOTE(MOA_TO_RAD(1.12)); }; class FullAuto: Mode_FullAuto { - dispersion = MOA_TO_RAD(1.12); + dispersion = QUOTE(MOA_TO_RAD(1.12)); }; }; // HK417A2 20" class arifle_SPAR_03_base_F: Rifle_Base_F { class Single: Mode_SemiAuto { - dispersion = MOA_TO_RAD(0.81); + dispersion = QUOTE(MOA_TO_RAD(0.81)); }; class FullAuto: Mode_FullAuto { - dispersion = MOA_TO_RAD(0.81); + dispersion = QUOTE(MOA_TO_RAD(0.81)); }; }; // RFB SDAR class SDAR_base_F: Rifle_Base_F { class Single: Mode_SemiAuto { - dispersion = MOA_TO_RAD(3.0); + dispersion = QUOTE(MOA_TO_RAD(3.0)); }; class Burst: Mode_Burst { - dispersion = MOA_TO_RAD(3.0); + dispersion = QUOTE(MOA_TO_RAD(3.0)); }; class FullAuto: Mode_FullAuto { - dispersion = MOA_TO_RAD(3.0); + dispersion = QUOTE(MOA_TO_RAD(3.0)); }; }; // QBZ-95-1 class arifle_CTAR_base_F: Rifle_Base_F { class Single: Mode_SemiAuto { - dispersion = MOA_TO_RAD(1.12); + dispersion = QUOTE(MOA_TO_RAD(1.12)); }; class FullAuto: Mode_FullAuto { - dispersion = MOA_TO_RAD(1.12); + dispersion = QUOTE(MOA_TO_RAD(1.12)); }; }; // QBU-88 class DMR_07_base_F: Rifle_Long_Base_F { class Single: Mode_SemiAuto { - dispersion = MOA_TO_RAD(1.01); + dispersion = QUOTE(MOA_TO_RAD(1.01)); }; }; // QBZ-95-1 LSW class arifle_CTARS_base_F: Rifle_Base_F { class Single: Mode_SemiAuto { - dispersion = MOA_TO_RAD(1.12); + dispersion = QUOTE(MOA_TO_RAD(1.12)); }; class FullAuto: Mode_FullAuto { - dispersion = MOA_TO_RAD(1.12); + dispersion = QUOTE(MOA_TO_RAD(1.12)); }; }; // Type 115 class arifle_ARX_base_F: Rifle_Base_F { class Single: Mode_SemiAuto { - dispersion = MOA_TO_RAD(0.90); + dispersion = QUOTE(MOA_TO_RAD(0.90)); }; class FullAuto: Mode_FullAuto { - dispersion = MOA_TO_RAD(0.90); + dispersion = QUOTE(MOA_TO_RAD(0.90)); }; }; // KH2002C Sama class arifle_Katiba_C_F: arifle_katiba_Base_F { class Single: Single { - dispersion = MOA_TO_RAD(0.90); + dispersion = QUOTE(MOA_TO_RAD(0.90)); }; class FullAuto: FullAuto { - dispersion = MOA_TO_RAD(0.90); + dispersion = QUOTE(MOA_TO_RAD(0.90)); }; }; // MXC class arifle_MXC_F: arifle_MX_Base_F { class Single: Single { - dispersion = MOA_TO_RAD(0.90); + dispersion = QUOTE(MOA_TO_RAD(0.90)); }; class FullAuto: FullAuto { - dispersion = MOA_TO_RAD(0.90); + dispersion = QUOTE(MOA_TO_RAD(0.90)); }; }; // TAR-21 class arifle_TRG21_F: Tavor_base_F { class Single: Single { - dispersion = MOA_TO_RAD(1.12); + dispersion = QUOTE(MOA_TO_RAD(1.12)); }; class FullAuto: FullAuto { - dispersion = MOA_TO_RAD(1.12); + dispersion = QUOTE(MOA_TO_RAD(1.12)); }; }; // F2000 Tactical class arifle_Mk20C_F: mk20_base_F { class Single: Single { - dispersion = MOA_TO_RAD(1.12); + dispersion = QUOTE(MOA_TO_RAD(1.12)); }; class FullAuto: FullAuto { - dispersion = MOA_TO_RAD(1.12); + dispersion = QUOTE(MOA_TO_RAD(1.12)); }; }; }; diff --git a/optionals/tracers/CfgAmmo.hpp b/optionals/tracers/CfgAmmo.hpp index 5e316b8176..7c6aae5923 100644 --- a/optionals/tracers/CfgAmmo.hpp +++ b/optionals/tracers/CfgAmmo.hpp @@ -5,177 +5,177 @@ class CfgAmmo { class SubmunitionBullet; //No idea - class B_56x15_dual: BulletBase {model = PATHTOF(ace_TracerWhite2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white + class B_56x15_dual: BulletBase {model = QPATHTOF(ace_TracerWhite2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white //Pistol - class B_9x21_Ball: BulletBase {model = PATHTOF(ace_TracerWhite2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white - class B_9x21_Ball_Tracer_Green: B_9x21_Ball {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green - class B_9x21_Ball_Tracer_Red: B_9x21_Ball_Tracer_Green {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red - class B_9x21_Ball_Tracer_Yellow: B_9x21_Ball_Tracer_Green {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow - class Sub_F_Signal_Green: B_9x21_Ball {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green - class Sub_F_Signal_Red: Sub_F_Signal_Green {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red + class B_9x21_Ball: BulletBase {model = QPATHTOF(ace_TracerWhite2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white + class B_9x21_Ball_Tracer_Green: B_9x21_Ball {model = QPATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green + class B_9x21_Ball_Tracer_Red: B_9x21_Ball_Tracer_Green {model = QPATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red + class B_9x21_Ball_Tracer_Yellow: B_9x21_Ball_Tracer_Green {model = QPATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow + class Sub_F_Signal_Green: B_9x21_Ball {model = QPATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green + class Sub_F_Signal_Red: Sub_F_Signal_Green {model = QPATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red - class B_45ACP_Ball: BulletBase {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red - class B_45ACP_Ball_Green: B_45ACP_Ball {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green - class B_45ACP_Ball_Yellow: B_45ACP_Ball {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow + class B_45ACP_Ball: BulletBase {model = QPATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red + class B_45ACP_Ball_Green: B_45ACP_Ball {model = QPATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green + class B_45ACP_Ball_Yellow: B_45ACP_Ball {model = QPATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow //Assault rifle - class B_50BW_Ball_F: BulletBase {model = PATHTOF(ace_TracerGreen2.p3d);}; + class B_50BW_Ball_F: BulletBase {model = QPATHTOF(ace_TracerGreen2.p3d);}; - class B_545x39_Ball_F: BulletBase {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow - class B_545x39_Ball_Green_F: B_545x39_Ball_F {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow + class B_545x39_Ball_F: BulletBase {model = QPATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow + class B_545x39_Ball_Green_F: B_545x39_Ball_F {model = QPATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow - class B_556x45_Ball: BulletBase {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow - class B_556x45_Ball_Tracer_Red: B_556x45_Ball {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red - class B_556x45_Ball_Tracer_Green: B_556x45_Ball {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green - class B_556x45_Ball_Tracer_Yellow: B_556x45_Ball {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow - // class B_556x45_Ball_Tracer_White: B_556x45_Ball {model = PATHTOF(ace_TracerWhite2.p3d);}; //New class for testing + class B_556x45_Ball: BulletBase {model = QPATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow + class B_556x45_Ball_Tracer_Red: B_556x45_Ball {model = QPATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red + class B_556x45_Ball_Tracer_Green: B_556x45_Ball {model = QPATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green + class B_556x45_Ball_Tracer_Yellow: B_556x45_Ball {model = QPATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow + // class B_556x45_Ball_Tracer_White: B_556x45_Ball {model = QPATHTOF(ace_TracerWhite2.p3d);}; //New class for testing - class B_580x42_Ball_F: BulletBase {model = PATHTOF(ace_TracerGreen2.p3d);}; - class ACE_580x42_Ball_Tracer_Red: B_580x42_Ball_F {model = PATHTOF(ace_TracerRed2.p3d);}; - class ACE_580x42_Ball_Tracer_Yellow: B_580x42_Ball_F {model = PATHTOF(ace_TracerYellow2.p3d);}; + class B_580x42_Ball_F: BulletBase {model = QPATHTOF(ace_TracerGreen2.p3d);}; + class ACE_580x42_Ball_Tracer_Red: B_580x42_Ball_F {model = QPATHTOF(ace_TracerRed2.p3d);}; + class ACE_580x42_Ball_Tracer_Yellow: B_580x42_Ball_F {model = QPATHTOF(ace_TracerYellow2.p3d);}; - class B_65x39_Caseless: BulletBase {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red - class B_65x39_Caseless_green: B_65x39_Caseless {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green - class B_65x39_Caseless_yellow: B_65x39_Caseless {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow + class B_65x39_Caseless: BulletBase {model = QPATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red + class B_65x39_Caseless_green: B_65x39_Caseless {model = QPATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green + class B_65x39_Caseless_yellow: B_65x39_Caseless {model = QPATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow class B_65x39_Case; - class B_65x39_Case_green: B_65x39_Case {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green - class B_65x39_Case_yellow: B_65x39_Case {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow + class B_65x39_Case_green: B_65x39_Case {model = QPATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green + class B_65x39_Case_yellow: B_65x39_Case {model = QPATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow - class B_65x39_Minigun_Caseless: SubmunitionBullet {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red + class B_65x39_Minigun_Caseless: SubmunitionBullet {model = QPATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red class B_65x39_Minigun_Caseless_Red_splash; - class B_65x39_Minigun_Caseless_Yellow_splash: B_65x39_Minigun_Caseless_Red_splash {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow - class B_65x39_Minigun_Caseless_Green_splash: B_65x39_Minigun_Caseless_Red_splash {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green + class B_65x39_Minigun_Caseless_Yellow_splash: B_65x39_Minigun_Caseless_Red_splash {model = QPATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow + class B_65x39_Minigun_Caseless_Green_splash: B_65x39_Minigun_Caseless_Red_splash {model = QPATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green - class B_762x39_Ball_F: BulletBase {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow - class B_762x39_Ball_Green_F: B_762x39_Ball_F {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow + class B_762x39_Ball_F: BulletBase {model = QPATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow + class B_762x39_Ball_Green_F: B_762x39_Ball_F {model = QPATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow //Battle rifle - class B_762x51_Ball: BulletBase {model = PATHTOF(ace_TracerWhite2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white - class B_762x51_Tracer_Red: B_762x51_Ball {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red - class B_762x51_Tracer_Green: B_762x51_Ball {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green - class B_762x51_Tracer_Yellow: B_762x51_Ball {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow + class B_762x51_Ball: BulletBase {model = QPATHTOF(ace_TracerWhite2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white + class B_762x51_Tracer_Red: B_762x51_Ball {model = QPATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red + class B_762x51_Tracer_Green: B_762x51_Ball {model = QPATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green + class B_762x51_Tracer_Yellow: B_762x51_Ball {model = QPATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow - class B_762x51_Minigun_Tracer_Red: SubmunitionBullet {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red - class B_762x51_Minigun_Tracer_Red_splash: B_762x51_Ball {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red + class B_762x51_Minigun_Tracer_Red: SubmunitionBullet {model = QPATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red + class B_762x51_Minigun_Tracer_Red_splash: B_762x51_Ball {model = QPATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red - class B_762x51_Minigun_Tracer_Yellow: B_762x51_Minigun_Tracer_Red {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow - class B_762x51_Minigun_Tracer_Yellow_splash: B_762x51_Minigun_Tracer_Red_splash {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow + class B_762x51_Minigun_Tracer_Yellow: B_762x51_Minigun_Tracer_Red {model = QPATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow + class B_762x51_Minigun_Tracer_Yellow_splash: B_762x51_Minigun_Tracer_Red_splash {model = QPATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow class B_762x54_Ball; - class B_762x54_Tracer_Red: B_762x54_Ball {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red - class B_762x54_Tracer_Green: B_762x54_Ball {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green - class B_762x54_Tracer_Yellow: B_762x54_Ball {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow + class B_762x54_Tracer_Red: B_762x54_Ball {model = QPATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red + class B_762x54_Tracer_Green: B_762x54_Ball {model = QPATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green + class B_762x54_Tracer_Yellow: B_762x54_Ball {model = QPATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow //Sniper rifle - class B_127x99_Ball: BulletBase {model = PATHTOF(ace_TracerWhite2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white - class B_127x99_Ball_Tracer_Red: B_127x99_Ball {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red - class B_127x99_Ball_Tracer_Green: B_127x99_Ball {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green - class B_127x99_Ball_Tracer_Yellow: B_127x99_Ball {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow + class B_127x99_Ball: BulletBase {model = QPATHTOF(ace_TracerWhite2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white + class B_127x99_Ball_Tracer_Red: B_127x99_Ball {model = QPATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red + class B_127x99_Ball_Tracer_Green: B_127x99_Ball {model = QPATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green + class B_127x99_Ball_Tracer_Yellow: B_127x99_Ball {model = QPATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow class B_127x99_SLAP; - class B_127x99_SLAP_Tracer_Red: B_127x99_SLAP {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red - class B_127x99_SLAP_Tracer_Green: B_127x99_SLAP {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green - class B_127x99_SLAP_Tracer_Yellow: B_127x99_SLAP {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow + class B_127x99_SLAP_Tracer_Red: B_127x99_SLAP {model = QPATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red + class B_127x99_SLAP_Tracer_Green: B_127x99_SLAP {model = QPATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green + class B_127x99_SLAP_Tracer_Yellow: B_127x99_SLAP {model = QPATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow - class B_408_Ball: BulletBase {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green - class B_127x33_Ball: BulletBase {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green + class B_408_Ball: BulletBase {model = QPATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green + class B_127x33_Ball: BulletBase {model = QPATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green - class B_127x108_Ball: BulletBase {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green + class B_127x108_Ball: BulletBase {model = QPATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green - class B_338_Ball: BulletBase {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red + class B_338_Ball: BulletBase {model = QPATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red - class B_338_NM_Ball: BulletBase {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red - class ACE_338_NM_Ball_green: B_338_NM_Ball {model = PATHTOF(ace_TracerGreen2.p3d);}; - class ACE_338_NM_Ball_yellow: B_338_NM_Ball {model = PATHTOF(ace_TracerYellow2.p3d);}; + class B_338_NM_Ball: BulletBase {model = QPATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red + class ACE_338_NM_Ball_green: B_338_NM_Ball {model = QPATHTOF(ace_TracerGreen2.p3d);}; + class ACE_338_NM_Ball_yellow: B_338_NM_Ball {model = QPATHTOF(ace_TracerYellow2.p3d);}; - class B_127x54_Ball: BulletBase {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green + class B_127x54_Ball: BulletBase {model = QPATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green - class B_93x64_Ball: BulletBase {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green - class ACE_93x64_Ball_tracer_red: B_93x64_Ball {model = PATHTOF(ace_TracerRed2.p3d);}; - class ACE_93x64_Ball_tracer_yellow: B_93x64_Ball {model = PATHTOF(ace_TracerYellow2.p3d);}; + class B_93x64_Ball: BulletBase {model = QPATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green + class ACE_93x64_Ball_tracer_red: B_93x64_Ball {model = QPATHTOF(ace_TracerRed2.p3d);}; + class ACE_93x64_Ball_tracer_yellow: B_93x64_Ball {model = QPATHTOF(ace_TracerYellow2.p3d);}; //Autocannon - class B_19mm_HE: BulletBase {model = PATHTOF(ace_TracerWhite2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white + class B_19mm_HE: BulletBase {model = QPATHTOF(ace_TracerWhite2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white class B_30mm_HE; - class B_30mm_HE_Tracer_Red: B_30mm_HE {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red - class B_30mm_HE_Tracer_Green: B_30mm_HE {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green - class B_30mm_HE_Tracer_Yellow: B_30mm_HE {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow + class B_30mm_HE_Tracer_Red: B_30mm_HE {model = QPATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red + class B_30mm_HE_Tracer_Green: B_30mm_HE {model = QPATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green + class B_30mm_HE_Tracer_Yellow: B_30mm_HE {model = QPATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow class B_30mm_MP; - class B_30mm_MP_Tracer_Red: B_30mm_MP {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red - class B_30mm_MP_Tracer_Green: B_30mm_MP {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green - class B_30mm_MP_Tracer_Yellow: B_30mm_MP {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow + class B_30mm_MP_Tracer_Red: B_30mm_MP {model = QPATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red + class B_30mm_MP_Tracer_Green: B_30mm_MP {model = QPATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green + class B_30mm_MP_Tracer_Yellow: B_30mm_MP {model = QPATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow class B_40mm_GPR; - class B_40mm_GPR_Tracer_Red: B_40mm_GPR {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red - class B_40mm_GPR_Tracer_Green: B_40mm_GPR {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green - class B_40mm_GPR_Tracer_Yellow: B_40mm_GPR {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow + class B_40mm_GPR_Tracer_Red: B_40mm_GPR {model = QPATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red + class B_40mm_GPR_Tracer_Green: B_40mm_GPR {model = QPATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green + class B_40mm_GPR_Tracer_Yellow: B_40mm_GPR {model = QPATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow - class B_20mm: BulletBase {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red - class B_20mm_Tracer_Red: B_20mm {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red + class B_20mm: BulletBase {model = QPATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red + class B_20mm_Tracer_Red: B_20mm {model = QPATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red - class B_25mm: BulletBase {model = PATHTOF(ace_TracerWhite2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white + class B_25mm: BulletBase {model = QPATHTOF(ace_TracerWhite2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white - class B_30mm_AP: BulletBase {model = PATHTOF(ace_TracerWhite2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white - class B_30mm_AP_Tracer_Red: B_30mm_AP {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red - class B_30mm_AP_Tracer_Green: B_30mm_AP {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green - class B_30mm_AP_Tracer_Yellow: B_30mm_AP {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow + class B_30mm_AP: BulletBase {model = QPATHTOF(ace_TracerWhite2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white + class B_30mm_AP_Tracer_Red: B_30mm_AP {model = QPATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red + class B_30mm_AP_Tracer_Green: B_30mm_AP {model = QPATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green + class B_30mm_AP_Tracer_Yellow: B_30mm_AP {model = QPATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow class B_30mm_APFSDS; - class B_30mm_APFSDS_Tracer_Red: B_30mm_APFSDS {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red - class B_30mm_APFSDS_Tracer_Green: B_30mm_APFSDS {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green - class B_30mm_APFSDS_Tracer_Yellow: B_30mm_APFSDS {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow + class B_30mm_APFSDS_Tracer_Red: B_30mm_APFSDS {model = QPATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red + class B_30mm_APFSDS_Tracer_Green: B_30mm_APFSDS {model = QPATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green + class B_30mm_APFSDS_Tracer_Yellow: B_30mm_APFSDS {model = QPATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow class B_40mm_APFSDS; - class B_40mm_APFSDS_Tracer_Red: B_40mm_APFSDS {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red - class B_40mm_APFSDS_Tracer_Green: B_40mm_APFSDS {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green - class B_40mm_APFSDS_Tracer_Yellow: B_40mm_APFSDS {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow + class B_40mm_APFSDS_Tracer_Red: B_40mm_APFSDS {model = QPATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red + class B_40mm_APFSDS_Tracer_Green: B_40mm_APFSDS {model = QPATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green + class B_40mm_APFSDS_Tracer_Yellow: B_40mm_APFSDS {model = QPATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow - class B_35mm_AA: BulletBase {model = PATHTOF(ace_TracerWhite2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white - class B_35mm_AA_Tracer_Red: B_35mm_AA {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red - class B_35mm_AA_Tracer_Green: B_35mm_AA {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green - class B_35mm_AA_Tracer_Yellow: B_35mm_AA {model = PATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow + class B_35mm_AA: BulletBase {model = QPATHTOF(ace_TracerWhite2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_white + class B_35mm_AA_Tracer_Red: B_35mm_AA {model = QPATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red + class B_35mm_AA_Tracer_Green: B_35mm_AA {model = QPATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green + class B_35mm_AA_Tracer_Yellow: B_35mm_AA {model = QPATHTOF(ace_TracerYellow2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_yellow - class Gatling_30mm_HE_Plane_CAS_01_F: BulletBase {model = PATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red.p3d - class Cannon_30mm_HE_Plane_CAS_02_F: Gatling_30mm_HE_Plane_CAS_01_F {model = PATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green.p3d + class Gatling_30mm_HE_Plane_CAS_01_F: BulletBase {model = QPATHTOF(ace_TracerRed2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_red.p3d + class Cannon_30mm_HE_Plane_CAS_02_F: Gatling_30mm_HE_Plane_CAS_01_F {model = QPATHTOF(ace_TracerGreen2.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\tracer_green.p3d //Cannon - class Sh_120mm_HE: ShellBase {model = PATHTOF(ace_shell_tracer_white.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_white - class Sh_120mm_HE_Tracer_Red: Sh_120mm_HE {model = PATHTOF(ace_shell_tracer_red.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_red - class Sh_120mm_HE_Tracer_Green: Sh_120mm_HE {model = PATHTOF(ace_shell_tracer_green.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_green - class Sh_120mm_HE_Tracer_Yellow: Sh_120mm_HE {model = PATHTOF(ace_shell_tracer_yellow.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_yellow + class Sh_120mm_HE: ShellBase {model = QPATHTOF(ace_shell_tracer_white.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_white + class Sh_120mm_HE_Tracer_Red: Sh_120mm_HE {model = QPATHTOF(ace_shell_tracer_red.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_red + class Sh_120mm_HE_Tracer_Green: Sh_120mm_HE {model = QPATHTOF(ace_shell_tracer_green.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_green + class Sh_120mm_HE_Tracer_Yellow: Sh_120mm_HE {model = QPATHTOF(ace_shell_tracer_yellow.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_yellow - class Sh_120mm_APFSDS: ShellBase {model = PATHTOF(ace_shell_tracer_white.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_white - class Sh_120mm_APFSDS_Tracer_Red: Sh_120mm_APFSDS {model = PATHTOF(ace_shell_tracer_red.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_red - class Sh_120mm_APFSDS_Tracer_Green: Sh_120mm_APFSDS {model = PATHTOF(ace_shell_tracer_green.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_green - class Sh_120mm_APFSDS_Tracer_Yellow: Sh_120mm_APFSDS {model = PATHTOF(ace_shell_tracer_yellow.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_yellow + class Sh_120mm_APFSDS: ShellBase {model = QPATHTOF(ace_shell_tracer_white.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_white + class Sh_120mm_APFSDS_Tracer_Red: Sh_120mm_APFSDS {model = QPATHTOF(ace_shell_tracer_red.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_red + class Sh_120mm_APFSDS_Tracer_Green: Sh_120mm_APFSDS {model = QPATHTOF(ace_shell_tracer_green.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_green + class Sh_120mm_APFSDS_Tracer_Yellow: Sh_120mm_APFSDS {model = QPATHTOF(ace_shell_tracer_yellow.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_yellow class Sh_125mm_APFSDS; - class Sh_125mm_APFSDS_T_Red: Sh_125mm_APFSDS {model = PATHTOF(ace_shell_tracer_red.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_red - class Sh_125mm_APFSDS_T_Green: Sh_125mm_APFSDS {model = PATHTOF(ace_shell_tracer_green.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_green - class Sh_125mm_APFSDS_T_Yellow: Sh_125mm_APFSDS {model = PATHTOF(ace_shell_tracer_yellow.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_yellow + class Sh_125mm_APFSDS_T_Red: Sh_125mm_APFSDS {model = QPATHTOF(ace_shell_tracer_red.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_red + class Sh_125mm_APFSDS_T_Green: Sh_125mm_APFSDS {model = QPATHTOF(ace_shell_tracer_green.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_green + class Sh_125mm_APFSDS_T_Yellow: Sh_125mm_APFSDS {model = QPATHTOF(ace_shell_tracer_yellow.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_yellow class Sh_125mm_HE; - class Sh_125mm_HE_T_Red: Sh_125mm_HE {model = PATHTOF(ace_shell_tracer_red.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_red - class Sh_125mm_HE_T_Green: Sh_125mm_HE {model = PATHTOF(ace_shell_tracer_green.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_green - class Sh_125mm_HE_T_Yellow: Sh_125mm_HE {model = PATHTOF(ace_shell_tracer_yellow.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_yellow + class Sh_125mm_HE_T_Red: Sh_125mm_HE {model = QPATHTOF(ace_shell_tracer_red.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_red + class Sh_125mm_HE_T_Green: Sh_125mm_HE {model = QPATHTOF(ace_shell_tracer_green.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_green + class Sh_125mm_HE_T_Yellow: Sh_125mm_HE {model = QPATHTOF(ace_shell_tracer_yellow.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_yellow class Sh_125mm_HEAT; - class Sh_125mm_HEAT_T_Red: Sh_125mm_HEAT {model = PATHTOF(ace_shell_tracer_red.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_red - class Sh_125mm_HEAT_T_Green: Sh_125mm_HEAT {model = PATHTOF(ace_shell_tracer_green.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_green - class Sh_125mm_HEAT_T_Yellow: Sh_125mm_HEAT {model = PATHTOF(ace_shell_tracer_yellow.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_yellow + class Sh_125mm_HEAT_T_Red: Sh_125mm_HEAT {model = QPATHTOF(ace_shell_tracer_red.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_red + class Sh_125mm_HEAT_T_Green: Sh_125mm_HEAT {model = QPATHTOF(ace_shell_tracer_green.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_green + class Sh_125mm_HEAT_T_Yellow: Sh_125mm_HEAT {model = QPATHTOF(ace_shell_tracer_yellow.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_yellow class Sh_105mm_APFSDS; - class Sh_105mm_APFSDS_T_Red: Sh_105mm_APFSDS {model = PATHTOF(ace_shell_tracer_red.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_red - class Sh_105mm_APFSDS_T_Green: Sh_105mm_APFSDS {model = PATHTOF(ace_shell_tracer_green.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_green - class Sh_105mm_APFSDS_T_Yellow: Sh_105mm_APFSDS {model = PATHTOF(ace_shell_tracer_yellow.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_yellow + class Sh_105mm_APFSDS_T_Red: Sh_105mm_APFSDS {model = QPATHTOF(ace_shell_tracer_red.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_red + class Sh_105mm_APFSDS_T_Green: Sh_105mm_APFSDS {model = QPATHTOF(ace_shell_tracer_green.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_green + class Sh_105mm_APFSDS_T_Yellow: Sh_105mm_APFSDS {model = QPATHTOF(ace_shell_tracer_yellow.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_yellow class Sh_105mm_HEAT_MP; - class Sh_105mm_HEAT_MP_T_Red: Sh_105mm_HEAT_MP {model = PATHTOF(ace_shell_tracer_red.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_red - class Sh_105mm_HEAT_MP_T_Green: Sh_105mm_HEAT_MP {model = PATHTOF(ace_shell_tracer_green.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_green - class Sh_105mm_HEAT_MP_T_Yellow: Sh_105mm_HEAT_MP {model = PATHTOF(ace_shell_tracer_yellow.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_yellow + class Sh_105mm_HEAT_MP_T_Red: Sh_105mm_HEAT_MP {model = QPATHTOF(ace_shell_tracer_red.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_red + class Sh_105mm_HEAT_MP_T_Green: Sh_105mm_HEAT_MP {model = QPATHTOF(ace_shell_tracer_green.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_green + class Sh_105mm_HEAT_MP_T_Yellow: Sh_105mm_HEAT_MP {model = QPATHTOF(ace_shell_tracer_yellow.p3d);}; //Replaces \A3\Weapons_f\Data\bullettracer\shell_tracer_yellow };