Skip to content

Commit 71a26b9

Browse files
johnb432PabstMirror
johnb432
and
PabstMirror
authored
Rangecard - Minor refactor (#11247)
* Minor refactor of rangecard * Update fnc_updateRangeCard.sqf * Apply suggestions from code review Co-authored-by: PabstMirror <pabstmirror@gmail.com> --------- Co-authored-by: PabstMirror <pabstmirror@gmail.com>
1 parent f89b600 commit 71a26b9

17 files changed

+534
-507
lines changed

‎addons/rangecard/CfgEventHandlers.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
class Extended_PreStart_EventHandlers {
32
class ADDON {
43
init = QUOTE(call COMPILE_SCRIPT(XEH_preStart));

‎addons/rangecard/CfgVehicles.hpp‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ class CfgVehicles {
66
class GVAR(copyRangeCard) {
77
displayName = CSTRING(CopyRangeCard);
88
distance = 2.0;
9-
condition = QUOTE(_target call FUNC(canCopy));
10-
statement = QUOTE(_target call FUNC(updateClassNames));
9+
condition = QUOTE(call FUNC(canCopy));
10+
statement = QUOTE(call FUNC(updateClassNames));
1111
icon = QPATHTOF(UI\RangeCard_Icon.paa);
1212
};
1313
};
@@ -16,23 +16,32 @@ class CfgVehicles {
1616
class ACE_Equipment {
1717
class GVAR(open) {
1818
displayName = CSTRING(OpenRangeCard);
19-
condition = QUOTE(call FUNC(canShow) && !GVAR(RangeCardOpened));
19+
condition = QUOTE(call FUNC(canShow));
2020
statement = QUOTE(false call FUNC(openRangeCard));
2121
showDisabled = 0;
2222
icon = QPATHTOF(UI\RangeCard_Icon.paa);
2323
exceptions[] = {"notOnMap", "isNotInside"};
24+
2425
class GVAR(openCopy) {
2526
displayName = CSTRING(OpenRangeCardCopy);
26-
condition = QUOTE(call FUNC(canShowCopy) && !GVAR(RangeCardOpened));
27+
condition = QUOTE(call FUNC(canShowCopy));
2728
statement = QUOTE(true call FUNC(openRangeCard));
2829
showDisabled = 0;
2930
icon = QPATHTOF(UI\RangeCard_Icon.paa);
3031
exceptions[] = {"notOnMap", "isNotInside"};
3132
};
3233
class GVAR(makeCopy) {
3334
displayName = CSTRING(CopyRangeCard);
34-
condition = QUOTE(call FUNC(canShow) && !GVAR(RangeCardOpened));
35-
statement = QUOTE(GVAR(zeroRangeCopy)=GVAR(zeroRange); GVAR(boreHeightCopy)=GVAR(boreHeight); GVAR(ammoClassCopy)=GVAR(ammoClass); GVAR(magazineClassCopy)=GVAR(magazineClass); GVAR(weaponClassCopy)=GVAR(weaponClass););
35+
condition = QUOTE(call FUNC(canShow));
36+
statement = QUOTE(GVAR(rangeCardCopyInfo) = +GVAR(rangeCardInfo));
37+
showDisabled = 0;
38+
icon = QPATHTOF(UI\RangeCard_Icon.paa);
39+
exceptions[] = {"notOnMap", "isNotInside"};
40+
};
41+
class GVAR(deleteCopy) {
42+
displayName = CSTRING(DeleteRangeCardCopy);
43+
condition = QUOTE(call FUNC(canShowCopy));
44+
statement = QUOTE(GVAR(rangeCardCopyInfo) = []);
3645
showDisabled = 0;
3746
icon = QPATHTOF(UI\RangeCard_Icon.paa);
3847
exceptions[] = {"notOnMap", "isNotInside"};
@@ -47,7 +56,7 @@ class CfgVehicles {
4756
author = "Ruthberg";
4857
scope = 2;
4958
scopeCurator = 2;
50-
displayName = "Range Card";
59+
displayName = CSTRING(Name);
5160
vehicleClass = "Items";
5261
class TransportItems {
5362
MACRO_ADDITEM(ACE_RangeCard,1);

‎addons/rangecard/CfgWeapons.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
class CfgWeapons {
32
class ACE_ItemCore;
43
class CBA_MiscItem_ItemInfo;

‎addons/rangecard/RscTitles.hpp‎

Lines changed: 139 additions & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -5,193 +5,192 @@
55
class RscListNBox;
66

77
class RangeCard_RscText {
8-
idc=-1;
9-
type=0;
10-
style=ST_CENTER;
11-
colorDisabled[]={0,0,0,0.0};
12-
colorBackground[]={0,0,0,0};
13-
colorText[]={0,0,0,1};
14-
text="";
15-
x=0;
16-
y=0;
17-
h=0.028;
18-
w=0.06;
19-
font="TahomaB";
20-
SizeEx=0.025;
21-
shadow=0;
8+
idc = -1;
9+
type = 0;
10+
style = ST_CENTER;
11+
colorDisabled[] = {0, 0, 0, 0.0};
12+
colorBackground[] = {0, 0, 0, 0};
13+
colorText[] = {0, 0, 0, 1};
14+
text = "";
15+
x = 0;
16+
y = 0;
17+
h = 0.028;
18+
w = 0.06;
19+
font = "TahomaB";
20+
SizeEx = 0.025;
21+
shadow = 0;
2222
};
2323

2424
class RangeCard_RscListNBox: RscListNBox {
25-
idc=-1;
26-
type=102;
27-
style=0;
28-
font="TahomaB";
29-
sizeEx=0.026;
30-
rowHeight=0.027;
31-
colorDisabled[]={0,0,0,0.0};
32-
colorBackground[]={1,1,1,1};
33-
colorText[]={0,0,0,1};
34-
colorScrollbar[]={0.95,0.95,0.95,1};
35-
colorSelect[]={0,0,0,1};
36-
colorSelect2[]={0,0,0,1};
37-
colorSelectBackground[]={1,1,1,0};
38-
colorSelectBackground2[]={1,1,1,0};
39-
period=0;
40-
LineSpacing=0;
41-
maxHistoryDelay=1.0;
42-
autoScrollSpeed=-1;
43-
autoScrollDelay=5;
44-
autoScrollRewind=0;
45-
soundSelect[]={"",0.09,1};
46-
drawSideArrows=0;
47-
idcLeft=-1;
48-
idcRight=-1;
25+
idc = -1;
26+
type = 102;
27+
style = 0;
28+
font = "TahomaB";
29+
sizeEx = 0.026;
30+
rowHeight = 0.027;
31+
colorDisabled[] = {0, 0, 0, 0.0};
32+
colorBackground[] = {1, 1, 1, 1};
33+
colorText[] = {0, 0, 0, 1};
34+
colorScrollbar[] = {0.95, 0.95, 0.95, 1};
35+
colorSelect[] = {0, 0, 0, 1};
36+
colorSelect2[] = {0, 0, 0, 1};
37+
colorSelectBackground[] = {1, 1, 1, 0};
38+
colorSelectBackground2[] = {1, 1, 1, 0};
39+
period = 0;
40+
LineSpacing = 0;
41+
maxHistoryDelay = 1.0;
42+
autoScrollSpeed = -1;
43+
autoScrollDelay = 5;
44+
autoScrollRewind = 0;
45+
soundSelect[] = {"", 0.09, 1};
46+
drawSideArrows = 0;
47+
idcLeft = -1;
48+
idcRight = -1;
4949

5050
class ScrollBar {
51-
color[]={1,1,1,0.6};
52-
colorActive[]={1,1,1,1};
53-
colorDisabled[]={1,1,1,0.3};
51+
color[] = {1, 1, 1, 0.6};
52+
colorActive[] = {1, 1, 1, 1};
53+
colorDisabled[] = {1, 1, 1, 0.3};
5454
};
5555

56-
class ListScrollBar: ScrollBar {
57-
};
56+
class ListScrollBar: ScrollBar {};
5857
};
5958

6059
class ACE_RangeCard_Dialog {
6160
idd = -1;
6261
movingEnable = 1;
63-
onLoad = "uiNamespace setVariable ['RangleCard_Display', (_this select 0)]";
64-
onUnload = QUOTE(call FUNC(onCloseDialog));
62+
onLoad = QUOTE(uiNamespace setVariable [ARR_2(QQGVAR(display),_this select 0)]; GVAR(rangeCardOpened) = true);
63+
onUnload = QUOTE(uiNamespace setVariable [ARR_2(QQGVAR(display),nil)]; GVAR(rangeCardOpened) = false);
6564
objects[] = {};
6665

6766
class controls {
6867
class BACKGROUND {
69-
moving=1;
70-
type=0;
71-
font="TahomaB";
72-
SizeEX=0.025;
73-
idc=-1;
74-
style=48;
75-
x="safeZoneX";
76-
y="safeZoneY+0.181889";
77-
w=1.62727*3/4;
78-
h=1.62727;
79-
colorBackground[]={1,1,1,1};
80-
colorText[]={1,1,1,1};
81-
text=QPATHTOF(UI\RangeCard.paa);
68+
moving = 1;
69+
type = 0;
70+
font = "TahomaB";
71+
SizeEX = 0.025;
72+
idc = -1;
73+
style = 48;
74+
x = "safeZoneX";
75+
y = "safeZoneY+0.181889";
76+
w = 1.62727*3/4;
77+
h = 1.62727;
78+
colorBackground[] = {1, 1, 1, 1};
79+
colorText[] = {1, 1, 1, 1};
80+
text = QPATHTOF(UI\RangeCard.paa);
8281
};
8382
class CAPTION_TEXT_1: RangeCard_RscText {
84-
idc=770000;
85-
style=ST_LEFT;
86-
x="safeZoneX+0.18";
87-
y="safeZoneY+0.181889+0.0";
88-
w=0.56*1.62727*3/4;
89-
text=".408 CheyTac - 410 gr Predator Projectiles";
83+
idc = IDC_CAPTION_TEXT_1;
84+
style = ST_LEFT;
85+
x = "safeZoneX+0.18";
86+
y = "safeZoneY+0.181889+0.0";
87+
w = 0.56*1.62727*3/4;
88+
text = ".408 CheyTac - 410 gr Predator Projectiles";
9089
};
9190
class CAPTION_TEXT_2: CAPTION_TEXT_1 {
92-
idc=770001;
93-
SizeEx=0.022;
94-
y="safeZoneY+0.181889+0.03";
95-
text="Drop Tables for B.P.: 1013.25mb; Corrected for MVV at Air/Ammo Temperatures -15-35 °C";
91+
idc = IDC_CAPTION_TEXT_2;
92+
SizeEx = 0.022;
93+
y = "safeZoneY+0.181889+0.03";
94+
text = "Drop Tables for B.P.: 1013.25mb; Corrected for MVV at Air/Ammo Temperatures -15-35 °C";
9695
};
9796
class CAPTION_TEXT_3: CAPTION_TEXT_2 {
98-
idc=770002;
99-
y="safeZoneY+0.181889+0.06";
100-
text="CheyTac Intervention - 29'' 1:13'' twist (M-200)";
97+
idc = IDC_CAPTION_TEXT_3;
98+
y = "safeZoneY+0.181889+0.06";
99+
text = "CheyTac Intervention - 29'' 1:13'' twist (M-200)";
101100
};
102101
class ZERO_RANGE_TEXT: RangeCard_RscText {
103-
idc=77003;
104-
style=ST_LEFT;
105-
SizeEx=0.028;
106-
x="safeZoneX+0.885";
107-
y="safeZoneY+0.181889+0.01";
108-
w=0.125*1.62727*3/4;
109-
text="100m ZERO";
102+
idc = IDC_ZERO_RANGE_TEXT;
103+
style = ST_LEFT;
104+
SizeEx = 0.028;
105+
x = "safeZoneX+0.885";
106+
y = "safeZoneY+0.181889+0.01";
107+
w = 0.125*1.62727*3/4;
108+
text = "100m ZERO";
110109
};
111110
class BAROMETRIC_PRESSURE_TEXT: ZERO_RANGE_TEXT {
112-
idc=77004;
113-
colorText[]={1,0,0,0.8};
114-
y="safeZoneY+0.181889+0.05";
115-
text="B.P.: 1013.25mb";
111+
idc = IDC_BAROMETRIC_PRESSURE_TEXT;
112+
colorText[] = {1, 0, 0, 0.8};
113+
y = "safeZoneY+0.181889+0.05";
114+
text = "B.P.: 1013.25mb";
116115
};
117116
class TARGET_RANGE_TEXT_1: RangeCard_RscText {
118-
idc=770010;
119-
colorText[]={1,1,1,1};
120-
x="safeZoneX+0.185";
121-
y="safeZoneY+0.181889+0.098";
122-
text="Target";
117+
idc = IDC_TARGET_RANGE_TEXT_1;
118+
colorText[] = {1, 1, 1, 1};
119+
x = "safeZoneX+0.185";
120+
y = "safeZoneY+0.181889+0.098";
121+
text = "Target";
123122
};
124123
class TARGET_RANGE_TEXT_2: TARGET_RANGE_TEXT_1 {
125-
idc=770011;
126-
SizeEx=0.03;
127-
y="safeZoneY+0.181889+0.125";
128-
text="Range";
124+
idc = IDC_TARGET_RANGE_TEXT_2;
125+
SizeEx = 0.03;
126+
y = "safeZoneY+0.181889+0.125";
127+
text = "Range";
129128
};
130129
class TARGET_RANGE_TEXT_3: TARGET_RANGE_TEXT_1 {
131-
idc=770012;
132-
y="safeZoneY+0.181889+0.152";
133-
text="(m)";
130+
idc = IDC_TARGET_RANGE_TEXT_3;
131+
y = "safeZoneY+0.181889+0.152";
132+
text = "(m)";
134133
};
135134
class BULLET_DROP_TEXT_1: RangeCard_RscText {
136-
idc=770013;
137-
x="safeZoneX+0.25";
138-
y="safeZoneY+0.181889+0.095";
139-
w=0.405*1.62727*3/4;
140-
text="Bullet Drop (MRADs)";
135+
idc = IDC_BULLET_DROP_TEXT_1;
136+
x = "safeZoneX+0.25";
137+
y = "safeZoneY+0.181889+0.095";
138+
w = 0.405*1.62727*3/4;
139+
text = "Bullet Drop (MRADs)";
141140
};
142141
class WIND_LEAD_CAPTION_LIST: RangeCard_RscListNBox {
143-
idc=770100;
144-
sizeEx=0.021;
145-
x="safeZoneX+0.728";
146-
y="safeZoneY+0.181889+0.091";
147-
w=0.25*1.62727*3/4;
148-
h=0.0909445;
149-
columns[]={0.03/2, 0.985/2};
150-
idcLeft=770101;
151-
idcRight=770102;
142+
idc = IDC_WIND_LEAD_CAPTION_LIST;
143+
sizeEx = 0.021;
144+
x = "safeZoneX+0.728";
145+
y = "safeZoneY+0.181889+0.091";
146+
w = 0.25*1.62727*3/4;
147+
h = 0.0909445;
148+
columns[] = {0.03/2, 0.985/2};
149+
idcLeft = IDC_WIND_LEAD_CAPTION_LIST_LEFT;
150+
idcRight = IDC_WIND_LEAD_CAPTION_LIST_RIGHT;
152151
};
153152
class TEMPERATURE_CAPTION_LIST_1: RangeCard_RscListNBox {
154-
idc=770200;
155-
x="safeZoneX+0.24";
156-
y="safeZoneY+0.181889+0.125";
157-
w=0.405*1.62727*3/4;
158-
h=0.0909445;
159-
columns[]={0/9, 1/9, 2/9, 3/9, 4/9, 5/9, 5.9/9, 6.9/9, 7.8/9};
160-
idcLeft=770201;
161-
idcRight=770202;
153+
idc = IDC_TEMPERATURE_CAPTION_LIST_1;
154+
x = "safeZoneX+0.24";
155+
y = "safeZoneY+0.181889+0.125";
156+
w = 0.405*1.62727*3/4;
157+
h = 0.0909445;
158+
columns[] = {0/9, 1/9, 2/9, 3/9, 4/9, 5/9, 5.9/9, 6.9/9, 7.8/9};
159+
idcLeft = IDC_TEMPERATURE_CAPTION_LIST_1_LEFT;
160+
idcRight = IDC_TEMPERATURE_CAPTION_LIST_1_RIGHT;
162161
};
163162
class TEMPERATURE_CAPTION_LIST_2: RangeCard_RscListNBox {
164-
idc=770300;
165-
x="safeZoneX+0.728";
166-
y="safeZoneY+0.181889+0.15";
167-
w=0.25*1.62727*3/4;
168-
h=0.0909445;
169-
columns[]={0/6, 0.9/6, 1.8/6, 2.9/6, 3.8/6, 4.8/6};
170-
idcLeft=770301;
171-
idcRight=770302;
163+
idc = IDC_TEMPERATURE_CAPTION_LIST_2;
164+
x = "safeZoneX+0.728";
165+
y = "safeZoneY+0.181889+0.15";
166+
w = 0.25*1.62727*3/4;
167+
h = 0.0909445;
168+
columns[] = {0/6, 0.9/6, 1.8/6, 2.9/6, 3.8/6, 4.8/6};
169+
idcLeft = IDC_TEMPERATURE_CAPTION_LIST_2_LEFT;
170+
idcRight = IDC_TEMPERATURE_CAPTION_LIST_2_RIGHT;
172171
};
173172
class RANGE_CARD_DATA: RangeCard_RscListNBox {
174-
idc=770400;
175-
x="safeZoneX+0.182";
176-
y="safeZoneY+0.181889+0.194";
177-
w=0.72*1.62727*3/4;
178-
h=1.62727;
179-
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,
173+
idc = IDC_RANGE_CARD_DATA;
174+
x = "safeZoneX+0.182";
175+
y = "safeZoneY+0.181889+0.194";
176+
w = 0.72*1.62727*3/4;
177+
h = 1.62727;
178+
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,
180179
9/16, 10.2/16, 11/16, 11.9/16, 12.8/16, 13.7/16, 14.6/16};
181-
idcLeft=770401;
182-
idcRight=770402;
180+
idcLeft = IDC_RANGE_CARD_DATA_LEFT;
181+
idcRight = IDC_RANGE_CARD_DATA_RIGHT;
183182
};
184183
class FOOTNOTE_TEXT_1: CAPTION_TEXT_1 {
185-
idc=770020;
186-
SizeEx=0.022;
187-
y="safeZoneY+1.72431";
188-
w=0.705*1.62727*3/4;
189-
text="For best results keep ammunition at ambient air temperature. Tables calculated for the above listed barrel";
184+
idc = IDC_FOOTNOTE_TEXT_1;
185+
SizeEx = 0.022;
186+
y = "safeZoneY+1.72431";
187+
w = 0.705*1.62727*3/4;
188+
text = "For best results keep ammunition at ambient air temperature. Tables calculated for the above listed barrel";
190189
};
191190
class FOOTNOTE_TEXT_2: FOOTNOTE_TEXT_1 {
192-
idc=770021;
193-
y="safeZoneY+1.72431+0.024";
194-
text="and load with optic mounted 1.5'' above line of bore.";
191+
idc = IDC_FOOTNOTE_TEXT_2;
192+
y = "safeZoneY+1.72431+0.024";
193+
text = "and load with optic mounted 1.5'' above line of bore.";
195194
};
196195
};
197196
};

0 commit comments

Comments
 (0)