Skip to content

Commit f44ad22

Browse files
authored
Realistic Names - Add names for MSBS underbarrels (#11262)
* Realistic Names - Add names for MSBS underbarrels * move dev scripts to folder and .inc to skip hemtt lints
1 parent f2515fd commit f44ad22

File tree

4 files changed

+38
-3
lines changed

4 files changed

+38
-3
lines changed

addons/realisticnames/CfgWeapons.hpp

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ class Mode_SemiAuto;
22
class Mode_FullAuto;
33

44
class CfgWeapons {
5+
class Rifle_Base_F;
6+
class UGL_F;
57
#include "CfgWeaponsAttachments.hpp"
68

79
// Assault rifles
@@ -899,7 +901,11 @@ class CfgWeapons {
899901
class arifle_MSBS65_sand_F: arifle_MSBS65_base_sand_F {
900902
displayName = CSTRING(arifle_MSBS65_sand);
901903
};
902-
class arifle_MSBS65_GL_base_F;
904+
class arifle_MSBS65_GL_base_F: arifle_MSBS65_base_F {
905+
class UGL: UGL_F {
906+
displayName = CSTRING(arifle_MSBS65_GL_muzzleGPBO40);
907+
};
908+
};
903909
class arifle_MSBS65_GL_F: arifle_MSBS65_GL_base_F {
904910
displayName = CSTRING(arifle_MSBS65_GL);
905911
};
@@ -931,7 +937,11 @@ class CfgWeapons {
931937
class arifle_MSBS65_Mark_sand_F: arifle_MSBS65_Mark_base_sand_F {
932938
displayName = CSTRING(arifle_MSBS65_Mark_sand);
933939
};
934-
class arifle_MSBS65_UBS_base_F;
940+
class arifle_MSBS65_UBS_base_F: arifle_MSBS65_base_F {
941+
class UBS_F: Rifle_Base_F {
942+
displayName = CSTRING(arifle_MSBS65_UBS_muzzleSix12);
943+
};
944+
};
935945
class arifle_MSBS65_UBS_F: arifle_MSBS65_UBS_base_F {
936946
displayName = CSTRING(arifle_MSBS65_UBS);
937947
};
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// [] execVM "z\ace\addons\realisticnames\dev_dumpPylon.sqf";
1+
// [] execVM "z\ace\addons\realisticnames\dev\dumpPylon.sqf";
22

33
private _justLog = true;
44

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// [] execVM "z\ace\addons\realisticnames\dev\findInherited.inc.sqf";
2+
3+
private _weapAndVic =
4+
("(getNumber (_x >> 'scope')) == 2" configClasses (configFile >> "CfgWeapons"))
5+
+ ("(getNumber (_x >> 'scope')) == 2" configClasses (configFile >> "CfgVehicles"));
6+
{
7+
private _name = getTextRaw (_x >> "displayName");
8+
if ((_name select [0, 8]) == "$str_ace") then { continue };
9+
private _config = _x;
10+
while {
11+
private _name = getTextRaw (_config >> "displayName");
12+
if ((_name select [0, 8]) == "$str_ace") exitWith {
13+
diag_log text format [" subvarient with non-ACE name found: %1", configName _x];
14+
systemChat format [" subvarient with non-ACE name found: %1", configName _x];
15+
};
16+
_config = inheritsFrom _config;
17+
_name != ""
18+
} do {};
19+
} forEach _weapAndVic;

addons/realisticnames/stringtable.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3084,6 +3084,9 @@
30843084
<Hungarian>MSBS Grot GL (Terepmintás)</Hungarian>
30853085
<Ukrainian>MSBS Grot GL (камуфляжний)</Ukrainian>
30863086
</Key>
3087+
<Key ID="STR_ACE_RealisticNames_arifle_MSBS65_GL_muzzleGPBO40">
3088+
<English>GPBO-40</English>
3089+
</Key>
30873090
<Key ID="STR_ACE_RealisticNames_arifle_MSBS65_GL_sand">
30883091
<English>MSBS Grot GL (Sand)</English>
30893092
<Czech>MSBS Grot GL (Písková)</Czech>
@@ -3228,6 +3231,9 @@
32283231
<Hungarian>MSBS Grot SG (Terepmintás)</Hungarian>
32293232
<Ukrainian>MSBS Grot SG (камуфляжний)</Ukrainian>
32303233
</Key>
3234+
<Key ID="STR_ACE_RealisticNames_arifle_MSBS65_UBS_muzzleSix12">
3235+
<English>SIX-12</English>
3236+
</Key>
32313237
<Key ID="STR_ACE_RealisticNames_arifle_MSBS65_UBS_sand">
32323238
<English>MSBS Grot SG (Sand)</English>
32333239
<Czech>MSBS Grot SG (Písková)</Czech>

0 commit comments

Comments
 (0)