From 24750781aa67122e53f78819a0b40dfbe554947e Mon Sep 17 00:00:00 2001 From: esteldunedain Date: Tue, 7 Apr 2015 18:03:30 -0300 Subject: [PATCH] Remove { on newlines --- addons/atragmx/RscTitles.hpp | 485 ++++++++++++----------------------- 1 file changed, 167 insertions(+), 318 deletions(-) diff --git a/addons/atragmx/RscTitles.hpp b/addons/atragmx/RscTitles.hpp index 5b9afc9441..23e813fea4 100644 --- a/addons/atragmx/RscTitles.hpp +++ b/addons/atragmx/RscTitles.hpp @@ -2,8 +2,7 @@ #define ST_RIGHT 1 #define ST_CENTER 2 -class ATragMX_RscText -{ +class ATragMX_RscText { idc=-1; type=0; style=256; @@ -19,8 +18,7 @@ class ATragMX_RscText SizeEx=0.03; shadow=0; }; -class ATragMX_RscButton -{ +class ATragMX_RscButton { text=""; colorText[]={0,0,0,1}; colorDisabled[]={0,0,0,0.0}; @@ -49,8 +47,7 @@ class ATragMX_RscButton borderSize=0; shadow=0; }; -class ATragMX_RscEdit -{ +class ATragMX_RscEdit { access=0; type=2; style=ST_RIGHT; @@ -69,8 +66,7 @@ class ATragMX_RscEdit autocomplete=""; shadow=0; }; -class ATragMX_RscToolbox -{ +class ATragMX_RscToolbox { type=6; style=ST_LEFT; x=0; @@ -85,7 +81,7 @@ class ATragMX_RscToolbox colorSelect[]={0,0,0,1}; colorSelectedBg[]={0,0,0,1}; colorTextDisable[]={0.4,0.4,0.4,1}; - colorDisable[]={0.4,0.4,0.4,1}; + colorDisable[]={0.4,0.4,0.4,1}; font="TahomaB"; sizeEx=0.027; rows=1; @@ -94,8 +90,7 @@ class ATragMX_RscToolbox values[]={1,0}; onToolBoxSelChanged=""; }; -class ATragMX_RscListBox -{ +class ATragMX_RscListBox { idc=-1; type=5; style=0; @@ -116,7 +111,7 @@ class ATragMX_RscListBox autoScrollDelay=5; autoScrollRewind=0; soundSelect[]={"",0.09,1}; - + class ScrollBar { color[]={1,1,1,0.6}; colorActive[]={1,1,1,1}; @@ -126,12 +121,11 @@ class ATragMX_RscListBox arrowEmpty="\ca\ui\data\igui_arrow_top_ca.paa"; border="\ca\ui\data\igui_border_scroll_ca.paa"; }; - + class ListScrollBar : ScrollBar { }; }; -class ATragMX_RscListNBox: ATragMX_RscListBox -{ +class ATragMX_RscListNBox: ATragMX_RscListBox { idc=-1; type=102; columns[]={0.0, 0.225, 0.475, 0.725}; @@ -139,8 +133,7 @@ class ATragMX_RscListNBox: ATragMX_RscListBox idcLeft=-1; idcRight=-1; }; -class ATragMX_RscControlsGroup -{ +class ATragMX_RscControlsGroup { type=15; idc=-1; style=16; @@ -149,8 +142,7 @@ class ATragMX_RscControlsGroup w=1; h=1; shadow=0; - class VScrollbar - { + class VScrollbar { color[]={1,1,1,0.6}; width=0.021; autoScrollSpeed=-1; @@ -158,14 +150,12 @@ class ATragMX_RscControlsGroup autoScrollRewind=0; shadow=0; }; - class HScrollbar - { + class HScrollbar { color[]={1,1,1,0.6}; height=0.028; shadow=0; }; - class ScrollBar - { + class ScrollBar { color[]={1,1,1,0.6}; colorActive[]={1,1,1,1}; colorDisabled[]={1,1,1,0.3}; @@ -174,28 +164,23 @@ class ATragMX_RscControlsGroup arrowFull="#(argb,8,8,3)color(1,1,1,1)"; border="#(argb,8,8,3)color(1,1,1,1)"; }; - class Controls - { + class Controls { }; }; -class ATragMX_RscLineBreak -{ +class ATragMX_RscLineBreak { idc=-1; type=98; shadow=0; }; -class ATragMX_Display -{ +class ATragMX_Display { name="ATragMX_Display"; idd=-1; onLoad="uiNamespace setVariable ['ATragMX_Display', (_this select 0)]"; movingEnable=1; controlsBackground[]={}; objects[]={}; - class controls - { - class BACKGROUND - { + class controls { + class BACKGROUND { moving=1; type=0; font="TahomaB"; @@ -210,8 +195,7 @@ class ATragMX_Display colorText[]={1,1,1,1}; text=PATHTOF(UI\atrag.paa); }; - class POWER: ATragMX_RscButton - { + class POWER: ATragMX_RscButton { idc=-1; x=0.55*safezoneW+safezoneX+0.145; y=0.265*safezoneH+safezoneY+0.94; @@ -220,15 +204,13 @@ class ATragMX_Display colorBackground[]={0,0,0,0.0}; action="closeDialog 0"; }; - class BACK: POWER - { + class BACK: POWER { idc=-1; w=0.06; x=0.55*safezoneW+safezoneX+0.3122; action=QUOTE(call FUNC(init); call FUNC(update_target_selection)); }; - class WINDOWS: ATragMX_RscButton - { + class WINDOWS: ATragMX_RscButton { idc=-1; x=0.55*safezoneW+safezoneX+0.130; y=0.265*safezoneH+safezoneY+0.88; @@ -236,14 +218,12 @@ class ATragMX_Display h=0.035*4/3; colorBackground[]={0,0,0,0.0}; }; - class OK: WINDOWS - { + class OK: WINDOWS { idc=-1; x=0.55*safezoneW+safezoneX+0.347; y=0.265*safezoneH+safezoneY+0.878; }; - class TOP: ATragMX_RscButton - { + class TOP: ATragMX_RscButton { idc=-1; x=0.55*safezoneW+safezoneX+0.242; y=0.265*safezoneH+safezoneY+0.85; @@ -252,14 +232,12 @@ class ATragMX_Display colorBackground[]={0,0,0,0.0}; action=QUOTE(((GVAR(ATragMX_currentGun) select GVAR(ATragMX_currentTarget)) + (count GVAR(ATragMX_gunList)) - 1) % (count GVAR(ATragMX_gunList)) call FUNC(change_gun)); }; - class BOTTOM: TOP - { + class BOTTOM: TOP { idc=-1; y=0.265*safezoneH+safezoneY+0.955; action=QUOTE(((GVAR(ATragMX_currentGun) select GVAR(ATragMX_currentTarget)) + (count GVAR(ATragMX_gunList)) + 1) % (count GVAR(ATragMX_gunList)) call FUNC(change_gun)); }; - class LEFT: ATragMX_RscButton - { + class LEFT: ATragMX_RscButton { idc=-1; x=0.55*safezoneW+safezoneX+0.1925; y=0.265*safezoneH+safezoneY+0.9; @@ -268,14 +246,12 @@ class ATragMX_Display colorBackground[]={0,0,0,0}; action=QUOTE(call FUNC(parse_input); GVAR(ATragMX_currentTarget) = (4 + GVAR(ATragMX_currentTarget) - 1) % 4; call FUNC(update_target_selection)); }; - class RIGHT: LEFT - { + class RIGHT: LEFT { idc=-1; x=0.55*safezoneW+safezoneX+0.2725; action=QUOTE(call FUNC(parse_input); GVAR(ATragMX_currentTarget) = (4 + GVAR(ATragMX_currentTarget) + 1) % 4; call FUNC(update_target_selection)); }; - class TOP_LEFT: ATragMX_RscButton - { + class TOP_LEFT: ATragMX_RscButton { idc=-1; x=0.55*safezoneW+safezoneX+0.162; y=0.265*safezoneH+safezoneY+0.82; @@ -283,14 +259,12 @@ class ATragMX_Display h=0.031*4/3; colorBackground[]={0,0,0,0.0}; }; - class TOP_RIGHT: TOP_LEFT - { + class TOP_RIGHT: TOP_LEFT { idc=-1; x=0.55*safezoneW+safezoneX+0.315; }; - - class TEXT_GUN_PROFILE: ATragMX_RscText - { + + class TEXT_GUN_PROFILE: ATragMX_RscText { idc=1000; x=0.550*safezoneW+safezoneX+0.11; y=0.265*safezoneH+safezoneY+0.20; @@ -300,8 +274,7 @@ class ATragMX_Display sizeEx=0.025; text=""; }; - class TEXT_D: ATragMX_RscButton - { + class TEXT_D: ATragMX_RscButton { idc=600; w=0.0231; x=0.550*safezoneW+safezoneX+0.29; @@ -313,22 +286,19 @@ class ATragMX_Display text="D"; action=QUOTE(GVAR(ATragMX_currentUnit)=0; call FUNC(update_unit_selection)); }; - class TEXT_E: TEXT_D - { + class TEXT_E: TEXT_D { idc=601; x=0.550*safezoneW+safezoneX+0.3131; text="E"; action=QUOTE(GVAR(ATragMX_currentUnit)=1; call FUNC(update_unit_selection)); }; - class TEXT_M: TEXT_E - { + 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(ATragMX_currentUnit)=2; call FUNC(update_unit_selection)); }; - class TEXT_RANGE_CARD: TEXT_D - { + class TEXT_RANGE_CARD: TEXT_D { idc=603; w=0.03; x=0.550*safezoneW+safezoneX+0.36; @@ -337,9 +307,8 @@ class ATragMX_Display text="RC"; action=QUOTE(call FUNC(toggle_range_card)); }; - - class TEXT_GUN: ATragMX_RscButton - { + + class TEXT_GUN: ATragMX_RscButton { idc=4000; w=0.0925; x=0.550*safezoneW+safezoneX+0.11; @@ -348,46 +317,39 @@ class ATragMX_Display colorFocused[]={0.15,0.21,0.23,0.2}; text="Gun"; }; - class TEXT_BORE_HEIGHT: TEXT_GUN_PROFILE - { + class TEXT_BORE_HEIGHT: TEXT_GUN_PROFILE { idc=10; style=ST_LEFT; y=0.265*safezoneH+safezoneY+0.285; text="BH"; }; - class TEXT_BORE_HEIGHT_INPUT: ATragMX_RscEdit - { + class TEXT_BORE_HEIGHT_INPUT: ATragMX_RscEdit { idc=100; w=0.058; x=0.550*safezoneW+safezoneX+0.145; y=0.265*safezoneH+safezoneY+0.285; onKeyUp=QUOTE(if (_this select 1 == 28) then {call FUNC(calculate_target_solution)}); }; - class TEXT_BULLET_MASS: TEXT_BORE_HEIGHT - { + class TEXT_BULLET_MASS: TEXT_BORE_HEIGHT { idc=11; style=ST_LEFT; y=0.265*safezoneH+safezoneY+0.320; text="BW"; }; - class TEXT_BULLET_MASS_INPUT: TEXT_BORE_HEIGHT_INPUT - { + class TEXT_BULLET_MASS_INPUT: TEXT_BORE_HEIGHT_INPUT { idc=110; y=0.265*safezoneH+safezoneY+0.320; }; - class TEXT_AIR_FRICTION: TEXT_BORE_HEIGHT - { + class TEXT_AIR_FRICTION: TEXT_BORE_HEIGHT { idc=12; y=0.265*safezoneH+safezoneY+0.355; text="C1"; }; - class TEXT_AIR_FRICTION_INPUT: TEXT_BORE_HEIGHT_INPUT - { + class TEXT_AIR_FRICTION_INPUT: TEXT_BORE_HEIGHT_INPUT { idc=120; y=0.265*safezoneH+safezoneY+0.355; }; - class TEXT_MUZZLE_VELOCITY: ATragMX_RscButton - { + class TEXT_MUZZLE_VELOCITY: ATragMX_RscButton { idc=13; style=0; w=0.03; @@ -397,37 +359,31 @@ class ATragMX_Display colorFocused[]={0.15,0.21,0.23,0.2}; text="MV"; }; - class TEXT_MUZZLE_VELOCITY_INPUT: TEXT_BORE_HEIGHT_INPUT - { + class TEXT_MUZZLE_VELOCITY_INPUT: TEXT_BORE_HEIGHT_INPUT { idc=130; y=0.265*safezoneH+safezoneY+0.390; }; - class TEXT_ZERO_RANGE: TEXT_BORE_HEIGHT - { + class TEXT_ZERO_RANGE: TEXT_BORE_HEIGHT { idc=14; y=0.265*safezoneH+safezoneY+0.425; text="ZR"; }; - class TEXT_ZERO_RANGE_INPUT: TEXT_BORE_HEIGHT_INPUT - { + class TEXT_ZERO_RANGE_INPUT: TEXT_BORE_HEIGHT_INPUT { idc=140; y=0.265*safezoneH+safezoneY+0.425; onKeyUp=QUOTE(if (_this select 1 == 28) then {call FUNC(update_zero_range)}); }; - class TEXT_ATMOSPHERE: TEXT_GUN - { + class TEXT_ATMOSPHERE: TEXT_GUN { idc=4001; x=0.550*safezoneW+safezoneX+0.205; text="Atmsphr"; }; - class TEXT_TEMPERATURE: TEXT_BULLET_MASS - { + class TEXT_TEMPERATURE: TEXT_BULLET_MASS { idc=20; x=0.550*safezoneW+safezoneX+0.20; text="Tmp"; }; - class TEXT_TEMPERATURE_INPUT: ATragMX_RscEdit - { + class TEXT_TEMPERATURE_INPUT: ATragMX_RscEdit { idc=200; w=0.050; x=0.550*safezoneW+safezoneX+0.245; @@ -435,31 +391,26 @@ class ATragMX_Display text=""; onKeyUp=QUOTE(if (_this select 1 == 28) then {call FUNC(calculate_target_solution)}); }; - class TEXT_BAROMETRIC_PRESSURE: TEXT_AIR_FRICTION - { + class TEXT_BAROMETRIC_PRESSURE: TEXT_AIR_FRICTION { idc=21; x=0.550*safezoneW+safezoneX+0.20; text="BP"; }; - class TEXT_BAROMETRIC_PRESSURE_INPUT: TEXT_TEMPERATURE_INPUT - { + class TEXT_BAROMETRIC_PRESSURE_INPUT: TEXT_TEMPERATURE_INPUT { idc=210; y=0.265*safezoneH+safezoneY+0.355; }; - class TEXT_RELATIVE_HUMIDITY: TEXT_AIR_FRICTION - { + class TEXT_RELATIVE_HUMIDITY: TEXT_AIR_FRICTION { idc=22; x=0.550*safezoneW+safezoneX+0.20; y=0.265*safezoneH+safezoneY+0.390; text="RH"; }; - class TEXT_RELATIVE_HUMIDITY_INPUT: TEXT_TEMPERATURE_INPUT - { + class TEXT_RELATIVE_HUMIDITY_INPUT: TEXT_TEMPERATURE_INPUT { idc=220; y=0.265*safezoneH+safezoneY+0.390; }; - class TEXT_TARGET_A: ATragMX_RscButton - { + class TEXT_TARGET_A: ATragMX_RscButton { idc=500; w=0.0231; x=0.550*safezoneW+safezoneX+0.205; @@ -471,42 +422,36 @@ class ATragMX_Display text="A"; action=QUOTE(call FUNC(parse_input); GVAR(ATragMX_currentTarget)=0; call FUNC(update_target_selection)); }; - class TEXT_TARGET_B: TEXT_TARGET_A - { + class TEXT_TARGET_B: TEXT_TARGET_A { idc=501; x=0.550*safezoneW+safezoneX+0.2281; text="B"; action=QUOTE(call FUNC(parse_input); GVAR(ATragMX_currentTarget)=1; call FUNC(update_target_selection)); }; - class TEXT_TARGET_C: TEXT_TARGET_B - { + class TEXT_TARGET_C: TEXT_TARGET_B { idc=502; x=0.550*safezoneW+safezoneX+0.2512; text="C"; action=QUOTE(call FUNC(parse_input); GVAR(ATragMX_currentTarget)=2; call FUNC(update_target_selection)); }; - class TEXT_TARGET_D: TEXT_TARGET_B - { + class TEXT_TARGET_D: TEXT_TARGET_B { idc=503; x=0.550*safezoneW+safezoneX+0.2743; text="D"; action=QUOTE(call FUNC(parse_input); GVAR(ATragMX_currentTarget)=3; call FUNC(update_target_selection)); }; - - class TEXT_TARGET: TEXT_GUN - { + + class TEXT_TARGET: TEXT_GUN { idc=4002; x=0.550*safezoneW+safezoneX+0.3; text="Target"; }; - class TEXT_WIND_SPEED: TEXT_BORE_HEIGHT - { + class TEXT_WIND_SPEED: TEXT_BORE_HEIGHT { idc=30; x=0.550*safezoneW+safezoneX+0.3; text="WS"; }; - class TEXT_WIND_SPEED_INPUT: ATragMX_RscEdit - { + class TEXT_WIND_SPEED_INPUT: ATragMX_RscEdit { idc=300; w=0.058; x=0.550*safezoneW+safezoneX+0.335; @@ -514,63 +459,53 @@ class ATragMX_Display onKeyUp=QUOTE(if (_this select 1 == 28) then {call FUNC(calculate_target_solution)}); text="0"; }; - class TEXT_WIND_DIRECTION: TEXT_BULLET_MASS - { + class TEXT_WIND_DIRECTION: TEXT_BULLET_MASS { idc=31; x=0.550*safezoneW+safezoneX+0.3; text="WD"; }; - class TEXT_WIND_DIRECTION_INPUT: TEXT_WIND_SPEED_INPUT - { + class TEXT_WIND_DIRECTION_INPUT: TEXT_WIND_SPEED_INPUT { idc=310; y=0.265*safezoneH+safezoneY+0.32; }; - class TEXT_INCLINATION_ANGLE: TEXT_AIR_FRICTION - { + class TEXT_INCLINATION_ANGLE: TEXT_AIR_FRICTION { idc=32; x=0.550*safezoneW+safezoneX+0.3; text="IA"; }; - class TEXT_INCLINATION_ANGLE_INPUT: TEXT_WIND_SPEED_INPUT - { + class TEXT_INCLINATION_ANGLE_INPUT: TEXT_WIND_SPEED_INPUT { idc=320; y=0.265*safezoneH+safezoneY+0.355; }; - class TEXT_TARGET_SPEED: TEXT_MUZZLE_VELOCITY - { + class TEXT_TARGET_SPEED: TEXT_MUZZLE_VELOCITY { idc=33; x=0.550*safezoneW+safezoneX+0.3; text="TS"; action=QUOTE(call FUNC(toggle_target_speed_assist)); }; - class TEXT_TARGET_SPEED_INPUT: TEXT_WIND_SPEED_INPUT - { + class TEXT_TARGET_SPEED_INPUT: TEXT_WIND_SPEED_INPUT { idc=330; y=0.265*safezoneH+safezoneY+0.39; }; - class TEXT_TARGET_RANGE: TEXT_TARGET_SPEED - { + class TEXT_TARGET_RANGE: TEXT_TARGET_SPEED { idc=34; 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_INPUT - { + class TEXT_TARGET_RANGE_INPUT: TEXT_WIND_SPEED_INPUT { idc=340; y=0.265*safezoneH+safezoneY+0.425; }; - - class TEXT_ELEVATION: TEXT_GUN_PROFILE - { + + class TEXT_ELEVATION: TEXT_GUN_PROFILE { idc=40; w=0.05; x=0.550*safezoneW+safezoneX+0.11; y=0.265*safezoneH+safezoneY+0.50; text="Elev"; }; - class TEXT_ABSOLUTE: TEXT_GUN_PROFILE - { + class TEXT_ABSOLUTE: TEXT_GUN_PROFILE { idc=4003; w=0.07; style=ST_CENTER; @@ -578,74 +513,62 @@ class ATragMX_Display y=0.265*safezoneH+safezoneY+0.47; text="Abs"; }; - class TEXT_RELATIVE: TEXT_ABSOLUTE - { + class TEXT_RELATIVE: TEXT_ABSOLUTE { idc=4004; x=0.550*safezoneW+safezoneX+0.245; text="Rel"; }; - class TEXT_CURRENT: TEXT_ABSOLUTE - { + class TEXT_CURRENT: TEXT_ABSOLUTE { idc=4005; x=0.550*safezoneW+safezoneX+0.32; text="Cur"; }; - class TEXT_ELEVATION_OUTPUT_ABSOLUTE: ATragMX_RscEdit - { + class TEXT_ELEVATION_OUTPUT_ABSOLUTE: ATragMX_RscEdit { idc=400; w=0.07; x=0.550*safezoneW+safezoneX+0.17; y=0.265*safezoneH+safezoneY+0.50; text=""; }; - class TEXT_ELEVATION_OUTPUT_RELATIVE: TEXT_ELEVATION_OUTPUT_ABSOLUTE - { + class TEXT_ELEVATION_OUTPUT_RELATIVE: TEXT_ELEVATION_OUTPUT_ABSOLUTE { idc=401; x=0.550*safezoneW+safezoneX+0.2465; }; - class TEXT_ELEVATION_INPUT_CURRENT: TEXT_ELEVATION_OUTPUT_ABSOLUTE - { + class TEXT_ELEVATION_INPUT_CURRENT: TEXT_ELEVATION_OUTPUT_ABSOLUTE { idc=402; x=0.550*safezoneW+safezoneX+0.323; onKeyUp=QUOTE(if (_this select 1 == 28) then {call FUNC(parse_input); call FUNC(update_result)}); }; - class TEXT_WINDAGE: TEXT_ELEVATION - { + class TEXT_WINDAGE: TEXT_ELEVATION { idc=41; y=0.265*safezoneH+safezoneY+0.535; text="Wind"; }; - class TEXT_WINDAGE_OUTPUT_ABSOLUTE: TEXT_ELEVATION_OUTPUT_ABSOLUTE - { + class TEXT_WINDAGE_OUTPUT_ABSOLUTE: TEXT_ELEVATION_OUTPUT_ABSOLUTE { idc=410; y=0.265*safezoneH+safezoneY+0.535; }; - class TEXT_WINDAGE_OUTPUT_RELATIVE: TEXT_WINDAGE_OUTPUT_ABSOLUTE - { + class TEXT_WINDAGE_OUTPUT_RELATIVE: TEXT_WINDAGE_OUTPUT_ABSOLUTE { idc=411; x=0.550*safezoneW+safezoneX+0.2465; }; - class TEXT_WINDAGE_INPUT_CURRENT: TEXT_WINDAGE_OUTPUT_ABSOLUTE - { + class TEXT_WINDAGE_INPUT_CURRENT: TEXT_WINDAGE_OUTPUT_ABSOLUTE { idc=412; x=0.550*safezoneW+safezoneX+0.323; onKeyUp=QUOTE(if (_this select 1 == 28) then {call FUNC(parse_input); call FUNC(update_result)}); }; - class TEXT_LEAD: TEXT_GUN - { + class TEXT_LEAD: TEXT_GUN { idc=42; w=0.05; x=0.550*safezoneW+safezoneX+0.11; y=0.265*safezoneH+safezoneY+0.57; text="Lead"; }; - class TEXT_LEAD_OUTPUT: TEXT_ELEVATION_OUTPUT_ABSOLUTE - { + class TEXT_LEAD_OUTPUT: TEXT_ELEVATION_OUTPUT_ABSOLUTE { idc=420; y=0.265*safezoneH+safezoneY+0.57; }; - class TEXT_RESET_SCOPE_ZERO: TEXT_GUN - { + class TEXT_RESET_SCOPE_ZERO: TEXT_GUN { idc=4006; w=0.07; style=ST_CENTER; @@ -655,23 +578,20 @@ class ATragMX_Display text="Reset"; action=QUOTE(call FUNC(reset_relative_click_memory)); }; - class TEXT_UPDATE_SCOPE_ZERO: TEXT_RESET_SCOPE_ZERO - { + class TEXT_UPDATE_SCOPE_ZERO: TEXT_RESET_SCOPE_ZERO { idc=4007; x=0.550*safezoneW+safezoneX+0.323; text="Update"; action=QUOTE(call FUNC(update_relative_click_memory)); }; - class TEXT_GUN_LIST: TEXT_GUN - { + class TEXT_GUN_LIST: TEXT_GUN { idc=4008; style=ST_LEFT; y=0.265*safezoneH+safezoneY+0.65; text="GunList"; action=QUOTE(call FUNC(toggle_gun_list)); }; - class TEXT_SCOPE_UNIT: TEXT_GUN_LIST - { + class TEXT_SCOPE_UNIT: TEXT_GUN_LIST { idc=2000; style=ST_CENTER; x=0.550*safezoneW+safezoneX+0.205; @@ -679,22 +599,19 @@ class ATragMX_Display text="TMOA"; action=QUOTE(call FUNC(cycle_scope_unit)); }; - class TEXT_CALCULATE: TEXT_SCOPE_UNIT - { + class TEXT_CALCULATE: TEXT_SCOPE_UNIT { idc=3000; style=ST_RIGHT; x=0.550*safezoneW+safezoneX+0.3; text="Calc"; action=QUOTE(call FUNC(calculate_target_solution)); }; - - class TEXT_RANGE_CARD_SCOPE_UNIT: TEXT_GUN_PROFILE - { + + class TEXT_RANGE_CARD_SCOPE_UNIT: TEXT_GUN_PROFILE { idc=5000; text=""; }; - class TEXT_RANGE_CARD_SETUP: ATragMX_RscButton - { + class TEXT_RANGE_CARD_SETUP: ATragMX_RscButton { idc=5001; w=0.055675; x=0.550*safezoneW+safezoneX+0.28; @@ -704,15 +621,13 @@ class ATragMX_Display text="Setup"; action=QUOTE(call FUNC(toggle_range_card_setup)); }; - class TEXT_RANGE_CARD_DONE: TEXT_RANGE_CARD_SETUP - { + class TEXT_RANGE_CARD_DONE: TEXT_RANGE_CARD_SETUP { idc=5002; 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 - { + class TEXT_RANGE_CARD_COLUMN_1_CAPTION: ATragMX_RscButton { idc=5003; style=ST_LEFT; w=0.07; @@ -721,27 +636,23 @@ class ATragMX_Display colorBackground[]={0.15,0.21,0.23,0.3}; text="Meters"; }; - class TEXT_RANGE_CARD_COLUMN_2_CAPTION: TEXT_RANGE_CARD_COLUMN_1_CAPTION - { + class TEXT_RANGE_CARD_COLUMN_2_CAPTION: TEXT_RANGE_CARD_COLUMN_1_CAPTION { idc=5004; x=0.550*safezoneW+safezoneX+0.180625; text="Elev"; }; - class TEXT_RANGE_CARD_COLUMN_3_CAPTION: TEXT_RANGE_CARD_COLUMN_1_CAPTION - { + class TEXT_RANGE_CARD_COLUMN_3_CAPTION: TEXT_RANGE_CARD_COLUMN_1_CAPTION { idc=5005; x=0.550*safezoneW+safezoneX+0.25125; text="Wind"; }; - class TEXT_RANGE_CARD_COLUMN_4_CAPTION: TEXT_RANGE_CARD_COLUMN_1_CAPTION - { + class TEXT_RANGE_CARD_COLUMN_4_CAPTION: TEXT_RANGE_CARD_COLUMN_1_CAPTION { idc=5006; x=0.550*safezoneW+safezoneX+0.321875; text="TmFlt"; action=QUOTE(call FUNC(cycle_range_card_columns)); }; - class TEXT_RANGE_CARD_OUTPUT: ATragMX_RscListNBox - { + class TEXT_RANGE_CARD_OUTPUT: ATragMX_RscListNBox { idc=5007; idcLeft=50061; idcRight=50062; @@ -750,9 +661,8 @@ class ATragMX_Display x=0.550*safezoneW+safezoneX+0.11; y=0.265*safezoneH+safezoneY+0.27; }; - - class TEXT_GUN_LIST_OUTPUT: ATragMX_RscListBox - { + + class TEXT_GUN_LIST_OUTPUT: ATragMX_RscListBox { idc=6000; w=0.16; h=0.45; @@ -762,15 +672,13 @@ class ATragMX_Display colorSelectBackground2[]={0.15,0.21,0.23,0.3}; onMouseButtonDblClick=QUOTE(true call FUNC(toggle_gun_list)); }; - class TEXT_GUN_LIST_COLUMN_CAPTION: TEXT_GUN_PROFILE - { + class TEXT_GUN_LIST_COLUMN_CAPTION: TEXT_GUN_PROFILE { idc=6001; w=0.16; colorBackground[]={0.15,0.21,0.23,0.3}; text="AtragGun.gun"; }; - class TEXT_GUN_LIST_OPEN_GUN: ATragMX_RscButton - { + class TEXT_GUN_LIST_OPEN_GUN: ATragMX_RscButton { idc=6002; style=ST_RIGHT; w=0.115; @@ -782,43 +690,37 @@ class ATragMX_Display text="Open Gun"; action=QUOTE(true call FUNC(toggle_gun_list)); }; - class TEXT_GUN_LIST_SAVE_GUN: TEXT_GUN_LIST_OPEN_GUN - { + class TEXT_GUN_LIST_SAVE_GUN: TEXT_GUN_LIST_OPEN_GUN { idc=6003; 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 - { + class TEXT_GUN_LIST_ADD_NEW_GUN: TEXT_GUN_LIST_OPEN_GUN { idc=6004; 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 - { + class TEXT_GUN_LIST_DELETE_GUN: TEXT_GUN_LIST_OPEN_GUN { idc=6005; 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 - { + class TEXT_GUN_LIST_NOTE: TEXT_GUN_LIST_OPEN_GUN { idc=6006; y=0.265*safezoneH+safezoneY+0.40; text="Note"; }; - class TEXT_GUN_LIST_DONE: TEXT_GUN_LIST_OPEN_GUN - { + class TEXT_GUN_LIST_DONE: TEXT_GUN_LIST_OPEN_GUN { idc=6007; 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 - { + + class TEXT_TARGET_RANGE_ASSIST_CAPTION: ATragMX_RscText { idc=7000; style=16+0x200; lineSpacing=1.0; @@ -829,8 +731,7 @@ class ATragMX_Display 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 - { + class TEXT_TARGET_RANGE_ASSIST_MEASUREMENT_METHOD: TEXT_TARGET_RANGE_ASSIST_CAPTION { idc=7001; style=ST_LEFT; x=0.550*safezoneW+safezoneX+0.115; @@ -840,8 +741,7 @@ class ATragMX_Display sizeEx=0.027; text="Using Target:"; }; - class TEXT_TARGET_RANGE_ASSIST_WIDTH_HEIGHT: ATragMX_RscToolbox - { + class TEXT_TARGET_RANGE_ASSIST_WIDTH_HEIGHT: ATragMX_RscToolbox { idc=7002; w=0.14; x=0.550*safezoneW+safezoneX+0.24; @@ -850,34 +750,29 @@ class ATragMX_Display values[]={1,0}; onToolBoxSelChanged="GVAR(ATragMX_rangeAssistUseTargetHeight)=((_this select 1)==0)"; }; - class TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE: TEXT_TARGET_RANGE_ASSIST_MEASUREMENT_METHOD - { + class TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE: TEXT_TARGET_RANGE_ASSIST_MEASUREMENT_METHOD { idc=7003; style=ST_RIGHT; x=0.550*safezoneW+safezoneX+0.10; y=0.265*safezoneH+safezoneY+0.4; text="Target Size"; }; - class TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE - { + class TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE { idc=7004; y=0.265*safezoneH+safezoneY+0.45; text="Image Size"; }; - class TEXT_TARGET_RANGE_ASSIST_ANGLE: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE - { + class TEXT_TARGET_RANGE_ASSIST_ANGLE: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE { idc=7005; y=0.265*safezoneH+safezoneY+0.5; text="Angle"; }; - class TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE - { + class TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE { idc=7006; y=0.265*safezoneH+safezoneY+0.55; text="Est Range"; }; - class TEXT_TARGET_RANGE_ASSIST_CALC_1: TEXT_MUZZLE_VELOCITY - { + class TEXT_TARGET_RANGE_ASSIST_CALC_1: TEXT_MUZZLE_VELOCITY { idc=7007; w=0.0231; x=0.550*safezoneW+safezoneX+0.22; @@ -886,65 +781,55 @@ class ATragMX_Display text="!"; action=QUOTE(0 call FUNC(calculate_target_range_assist)); }; - class TEXT_TARGET_RANGE_ASSIST_CALC_2: TEXT_TARGET_RANGE_ASSIST_CALC_1 - { + class TEXT_TARGET_RANGE_ASSIST_CALC_2: TEXT_TARGET_RANGE_ASSIST_CALC_1 { idc=7008; 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 - { + class TEXT_TARGET_RANGE_ASSIST_CALC_3: TEXT_TARGET_RANGE_ASSIST_CALC_1 { idc=7009; 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 - { + 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; }; - class TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE_INPUT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_INPUT - { + class TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE_INPUT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_INPUT { idc=7011; y=0.265*safezoneH+safezoneY+0.45; }; - class TEXT_TARGET_RANGE_ASSIST_ANGLE_INPUT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_INPUT - { + class TEXT_TARGET_RANGE_ASSIST_ANGLE_INPUT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_INPUT { idc=7012; y=0.265*safezoneH+safezoneY+0.5; }; - class TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE_INPUT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_INPUT - { + class TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE_INPUT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_INPUT { idc=7013; y=0.265*safezoneH+safezoneY+0.55; }; - class TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_UNIT: TEXT_TARGET_RANGE_ASSIST_CALC_1 - { + 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; text="cm"; action=QUOTE(GVAR(ATragMX_rangeAssistTargetSizeUnit)=(GVAR(ATragMX_rangeAssistTargetSizeUnit)+1) % (count GVAR(GVAR(ATragMX_rangeAssistTargetSizeUnit)s)); ctrlSetText [7014, GVAR(GVAR(ATragMX_rangeAssistTargetSizeUnit)s) select GVAR(ATragMX_rangeAssistTargetSizeUnit)]); }; - class TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE_UNIT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_UNIT - { + class TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE_UNIT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_UNIT { idc=7015; y=0.265*safezoneH+safezoneY+0.45; text="MIL"; action=QUOTE(GVAR(ATragMX_rangeAssistImageSizeUnit)=(GVAR(ATragMX_rangeAssistImageSizeUnit)+1) % (count GVAR(ATragMX_rangeAssistImageSizeUnits)); ctrlSetText [7015, GVAR(ATragMX_rangeAssistImageSizeUnits) select GVAR(ATragMX_rangeAssistImageSizeUnit)]); }; - class TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE_UNIT: TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE - { + 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; text="Meters"; }; - class TEXT_TARGET_RANGE_ASSIST_DONE: ATragMX_RscButton - { + class TEXT_TARGET_RANGE_ASSIST_DONE: ATragMX_RscButton { idc=7017; style=ST_CENTER; w=0.07; @@ -955,69 +840,58 @@ class ATragMX_Display text="Done"; action=QUOTE(1 call FUNC(toggle_target_range_assist)); }; - class TEXT_TARGET_RANGE_ASSIST_CANCEL: TEXT_TARGET_RANGE_ASSIST_DONE - { + class TEXT_TARGET_RANGE_ASSIST_CANCEL: TEXT_TARGET_RANGE_ASSIST_DONE { idc=7018; 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 - { + class TEXT_TARGET_RANGE_ASSIST_PREV: TEXT_TARGET_RANGE_ASSIST_DONE { idc=7019; x=0.550*safezoneW+safezoneX+0.25125; text="Prev"; action=""; }; - class TEXT_TARGET_RANGE_ASSIST_NEXT: TEXT_TARGET_RANGE_ASSIST_DONE - { + class TEXT_TARGET_RANGE_ASSIST_NEXT: TEXT_TARGET_RANGE_ASSIST_DONE { idc=7020; x=0.550*safezoneW+safezoneX+0.321875; text="Next"; action=""; }; - - class TEXT_TARGET_SPEED_ASSIST_TARGET_RANGE: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE - { + + class TEXT_TARGET_SPEED_ASSIST_TARGET_RANGE: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE { idc=8000; x=0.550*safezoneW+safezoneX+0.12; text="Target Range"; }; - class TEXT_TARGET_SPEED_ASSIST_NUM_TICKS: TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE - { + class TEXT_TARGET_SPEED_ASSIST_NUM_TICKS: TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE { idc=8001; x=0.550*safezoneW+safezoneX+0.12; text="Num Ticks"; }; - class TEXT_TARGET_SPEED_ASSIST_TIME: TEXT_TARGET_RANGE_ASSIST_ANGLE - { + class TEXT_TARGET_SPEED_ASSIST_TIME: TEXT_TARGET_RANGE_ASSIST_ANGLE { idc=8002; x=0.550*safezoneW+safezoneX+0.12; text="Time (secs)"; }; - class TEXT_TARGET_SPEED_ASSIST_TARGET_ESTIMATED_SPEED: TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE - { + class TEXT_TARGET_SPEED_ASSIST_TARGET_ESTIMATED_SPEED: TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE { idc=8003; 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 - { + class TEXT_TARGET_SPEED_ASSIST_TARGET_RANGE_INPUT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_INPUT { idc=8004; onKeyUp=QUOTE(if (_this select 1 == 28) then {call FUNC(calculate_target_speed_assist)}); }; - class TEXT_TARGET_SPEED_ASSIST_NUM_TICKS_INPUT: TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE_INPUT - { + class TEXT_TARGET_SPEED_ASSIST_NUM_TICKS_INPUT: TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE_INPUT { idc=8005; onKeyUp=QUOTE(if (_this select 1 == 28) then {call FUNC(calculate_target_speed_assist)}); }; - class TEXT_TARGET_SPEED_ASSIST_TIME_INPUT: TEXT_TARGET_RANGE_ASSIST_ANGLE_INPUT - { + class TEXT_TARGET_SPEED_ASSIST_TIME_INPUT: TEXT_TARGET_RANGE_ASSIST_ANGLE_INPUT { idc=8006; onKeyUp=QUOTE(if (_this select 1 == 28) then {call FUNC(calculate_target_speed_assist)}); }; - class TEXT_TARGET_SPEED_ASSIST_TARGET_ESTIMATED_SPEED_OUTPUT: TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE - { + 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; @@ -1025,51 +899,42 @@ class ATragMX_Display 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 - { + class TEXT_TARGET_SPEED_ASSIST_TARGET_RANGE_UNIT: TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE_UNIT { idc=8008; y=0.265*safezoneH+safezoneY+0.4; text="Meters"; }; - class TEXT_TARGET_SPEED_ASSIST_NUM_TICKS_UNIT: TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE_UNIT - { + class TEXT_TARGET_SPEED_ASSIST_NUM_TICKS_UNIT: TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE_UNIT { idc=8009; text="MIL"; action=QUOTE(GVAR(ATragMX_speedAssistNumTicksUnit)=(GVAR(ATragMX_speedAssistNumTicksUnit)+1) % (count GVAR(ATragMX_speedAssistNumTicksUnits)); ctrlSetText [8009, GVAR(ATragMX_speedAssistNumTicksUnits) select GVAR(ATragMX_speedAssistNumTicksUnit)]; call FUNC(calculate_target_speed_assist)); }; - class TEXT_TARGET_SPEED_ASSIST_TIMER_START: TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE_UNIT - { + class TEXT_TARGET_SPEED_ASSIST_TIMER_START: TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE_UNIT { idc=8010; y=0.265*safezoneH+safezoneY+0.5; text="Start"; action=QUOTE(call FUNC(target_speed_assist_timer)); }; - class TEXT_TARGET_SPEED_ASSIST_TARGET_ESTIMATED_SPEED_UNIT: TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE_UNIT - { + class TEXT_TARGET_SPEED_ASSIST_TARGET_ESTIMATED_SPEED_UNIT: TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE_UNIT { idc=8011; text="m/s"; }; - class TEXT_TARGET_SPEED_ASSIST_DONE: TEXT_TARGET_RANGE_ASSIST_DONE - { + class TEXT_TARGET_SPEED_ASSIST_DONE: TEXT_TARGET_RANGE_ASSIST_DONE { idc=8012; action=QUOTE(1 call FUNC(toggle_target_speed_assist)); }; - class TEXT_TARGET_SPEED_ASSIST_CANCEL: TEXT_TARGET_RANGE_ASSIST_CANCEL - { + class TEXT_TARGET_SPEED_ASSIST_CANCEL: TEXT_TARGET_RANGE_ASSIST_CANCEL { idc=8013; action=QUOTE(0 call FUNC(toggle_target_speed_assist)); }; - class TEXT_TARGET_SPEED_ASSIST_PREV: TEXT_TARGET_RANGE_ASSIST_PREV - { + class TEXT_TARGET_SPEED_ASSIST_PREV: TEXT_TARGET_RANGE_ASSIST_PREV { idc=8014; }; - class TEXT_TARGET_SPEED_ASSIST_NEXT: TEXT_TARGET_RANGE_ASSIST_NEXT - { + class TEXT_TARGET_SPEED_ASSIST_NEXT: TEXT_TARGET_RANGE_ASSIST_NEXT { idc=8015; }; - - class TEXT_TARGET_SPEED_ASSIST_TIMER_STOP_BACKGROUND: ATragMX_RscButton - { + + class TEXT_TARGET_SPEED_ASSIST_TIMER_STOP_BACKGROUND: ATragMX_RscButton { idc=9000; w=0.285; h=0.49; @@ -1078,9 +943,8 @@ class ATragMX_Display colorBackground[]={0,0,0,0}; colorBackgroundActive[]={0,0,0,0}; action=QUOTE(GVAR(ATragMX_speedAssistTimer=false)); - } - class TEXT_TARGET_SPEED_ASSIST_TIME_OUTPUT: ATragMX_RscText - { + }; + 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; @@ -1090,8 +954,7 @@ class ATragMX_Display sizeEx=0.05; text="0.0"; }; - class TEXT_TARGET_SPEED_ASSIST_TIMER_STOP: ATragMX_RscButton - { + class TEXT_TARGET_SPEED_ASSIST_TIMER_STOP: ATragMX_RscButton { idc=9002; style=ST_CENTER; w=0.07; @@ -1103,61 +966,50 @@ class ATragMX_Display text="Stop"; action=QUOTE(GVAR(ATragMX_speedAssistTimer=false)); }; - - class TEXT_RANGE_CARD_SETUP_START_RANGE: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE - { + + class TEXT_RANGE_CARD_SETUP_START_RANGE: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE { idc=10000; x=0.550*safezoneW+safezoneX+0.12; text="Start Range"; }; - class TEXT_RANGE_CARD_SETUP_END_RANGE: TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE - { + class TEXT_RANGE_CARD_SETUP_END_RANGE: TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE { idc=10001; x=0.550*safezoneW+safezoneX+0.12; text="End Range"; }; - class TEXT_RANGE_CARD_SETUP_INCREMENT: TEXT_TARGET_RANGE_ASSIST_ANGLE - { + class TEXT_RANGE_CARD_SETUP_INCREMENT: TEXT_TARGET_RANGE_ASSIST_ANGLE { idc=10002; x=0.550*safezoneW+safezoneX+0.12; text="Increment"; }; - class TEXT_RANGE_CARD_SETUP_START_RANGE_INPUT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_INPUT - { + class TEXT_RANGE_CARD_SETUP_START_RANGE_INPUT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_INPUT { idc=10003; onKeyUp=QUOTE(if (_this select 1 == 28) then {1 call FUNC(toggle_range_card_setup)}); }; - class TEXT_RANGE_CARD_SETUP_END_RANGE_INPUT: TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE_INPUT - { + class TEXT_RANGE_CARD_SETUP_END_RANGE_INPUT: TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE_INPUT { idc=10004; onKeyUp=QUOTE(if (_this select 1 == 28) then {1 call FUNC(toggle_range_card_setup)}); }; - class TEXT_RANGE_CARD_SETUP_INCREMENT_INPUT: TEXT_TARGET_RANGE_ASSIST_ANGLE_INPUT - { + class TEXT_RANGE_CARD_SETUP_INCREMENT_INPUT: TEXT_TARGET_RANGE_ASSIST_ANGLE_INPUT { idc=10005; onKeyUp=QUOTE(if (_this select 1 == 28) then {1 call FUNC(toggle_range_card_setup)}); }; - class TEXT_RANGE_CARD_SETUP_DONE: TEXT_TARGET_SPEED_ASSIST_DONE - { + class TEXT_RANGE_CARD_SETUP_DONE: TEXT_TARGET_SPEED_ASSIST_DONE { idc=10006; action=QUOTE(1 call FUNC(toggle_range_card_setup)); }; - class TEXT_RANGE_CARD_SETUP_CANCEL: TEXT_TARGET_SPEED_ASSIST_CANCEL - { + class TEXT_RANGE_CARD_SETUP_CANCEL: TEXT_TARGET_SPEED_ASSIST_CANCEL { idc=10007; action=QUOTE(0 call FUNC(toggle_range_card_setup)); }; - class TEXT_RANGE_CARD_SETUP_PREV: TEXT_TARGET_SPEED_ASSIST_PREV - { + class TEXT_RANGE_CARD_SETUP_PREV: TEXT_TARGET_SPEED_ASSIST_PREV { idc=10008; }; - class TEXT_RANGE_CARD_SETUP_NEXT: TEXT_TARGET_SPEED_ASSIST_NEXT - { + class TEXT_RANGE_CARD_SETUP_NEXT: TEXT_TARGET_SPEED_ASSIST_NEXT { idc=10009; }; - - class TEXT_ADD_NEW_GUN_CAPTION: ATragMX_RscText - { + + class TEXT_ADD_NEW_GUN_CAPTION: ATragMX_RscText { idc=11000; style=ST_LEFT; w=0.25; @@ -1167,8 +1019,7 @@ class ATragMX_Display sizeEx=0.025; text="New Gun Name"; }; - class TEXT_ADD_NEW_GUN_GUN_NAME_INPUT: ATragMX_RscEdit - { + class TEXT_ADD_NEW_GUN_GUN_NAME_INPUT: ATragMX_RscEdit { idc=11001; style=ST_LEFT; w=0.225; @@ -1177,8 +1028,7 @@ class ATragMX_Display y=0.265*safezoneH+safezoneY+0.28; text=""; }; - class TEXT_ADD_NEW_GUN_OK: ATragMX_RscButton - { + class TEXT_ADD_NEW_GUN_OK: ATragMX_RscButton { idc=11002; style=ST_CENTER; w=0.1; @@ -1190,8 +1040,7 @@ class ATragMX_Display text="OK"; action=QUOTE(call FUNC(add_new_gun); false call FUNC(show_add_new_gun); true call FUNC(show_gun_list)); }; - class TEXT_ADD_NEW_GUN_CANCEL: TEXT_ADD_NEW_GUN_OK - { + class TEXT_ADD_NEW_GUN_CANCEL: TEXT_ADD_NEW_GUN_OK { idc=11003; x=0.550*safezoneW+safezoneX+0.245; text="Cancel";