Skip to content

Commit db9b8da

Browse files
SkippieDippieSkippieDippie
authored
Update v2023.03.10 #38
Update v2023.03.10
2 parents 6472c97 + a7c72cd commit db9b8da

File tree

127 files changed

+9039
-24795
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+9039
-24795
lines changed

cvo_compats_common/PREFIX renamed to cvo_compats_common/$PBOPREFIX$

File renamed without changes.

‎cvo_compats_common/cba/config.cpp‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
#include "\cvo\compats\cvo_compats_common\macros.hpp"
2+
3+
#if CBA_LOADED
4+
class CfgPatches {
5+
class CVO_Compats_Common_CBA {
6+
addonRootClass = "CVO_Compats_Common";
7+
8+
requiredAddons[] = {
9+
"cba_main"
10+
};
11+
requiredVersion = 1.00;
12+
13+
units[] = {};
14+
weapons[] = {};
15+
};
16+
};
17+
18+
class CfgWeapons {
19+
class CVO_acc_ir_flash {
20+
color[] = {60,40,40};
21+
ambient[] = {9,8,7};
22+
intensity = 600;
23+
24+
size = 1;
25+
26+
innerAngle = 2.5;
27+
outerAngle = 80;
28+
coneFadeCoef = 200;
29+
30+
position = "laser pos";
31+
direction = "laser dir";
32+
33+
useFlare = 1;
34+
flareSize = 0.7;
35+
flareMaxDistance = 100;
36+
37+
dayLight = 0;
38+
irlight = 1;
39+
class Attenuation
40+
{
41+
start = 0.1;
42+
constant = 2;
43+
linear = 2;
44+
quadratic = 25;
45+
46+
hardLimitStart = 100;
47+
hardLimitEnd = 200;
48+
};
49+
scale[]={0};
50+
};
51+
52+
class CVO_acc_vis_laser_red {
53+
irLaserPos = "laser pos";
54+
irLaserEnd = "laser dir";
55+
56+
irDistance = 1000;
57+
58+
beamColor[] = {1,0,0};
59+
dotColor[] = {10000,0,0};
60+
dotSize = 2;
61+
62+
beamThickness = 0.15;
63+
beamMaxLength = 3000;
64+
65+
isIR = 0;
66+
};
67+
};
68+
69+
#endif

‎cvo_compats_common/cba/stringtable.xml‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project name="CVO Everything Compats - Common">
3+
<Package name="CBA">
4+
<Container name="Weapon Accessories">
5+
<Key ID="STR_CVO_CBA_Accessories_Reticle_Dot">
6+
<Original>Dot</Original>
7+
<Russian>Точка</Russian>
8+
</Key>
9+
<Key ID="STR_CVO_CBA_Accessories_Reticle_VBar">
10+
<Original>V-bar</Original>
11+
<Russian>Пика</Russian>
12+
</Key>
13+
<Key ID="STR_CVO_CBA_Accessories_Reticle_VBarDot">
14+
<Original>V-bar with dot</Original>
15+
<Russian>Пика с точкой</Russian>
16+
</Key>
17+
<Key ID="STR_CVO_CBA_Accessories_Reticle_TBar">
18+
<Original>T-bar</Original>
19+
<Russian>Т-образная</Russian>
20+
</Key>
21+
<Key ID="STR_CVO_CBA_Accessories_Side_IR_Laser">
22+
<Original>IR Laser</Original>
23+
<Russian>ИК лазер</Russian>
24+
</Key>
25+
<Key ID="STR_CVO_CBA_Accessories_Side_IR_Light">
26+
<Original>IR Illuminator</Original>
27+
<Russian>ИК осветитель</Russian>
28+
</Key>
29+
<Key ID="STR_CVO_CBA_Accessories_Side_IR_LightLaser">
30+
<Original>IR Laser + Illuminator</Original>
31+
<Russian>ИК лазер + осветитель</Russian>
32+
</Key>
33+
<Key ID="STR_CVO_CBA_Accessories_Side_Vis_Laser">
34+
<Original>Visible Laser</Original>
35+
<Russian>Видимый лазер</Russian>
36+
</Key>
37+
<Key ID="STR_CVO_CBA_Accessories_Side_Vis_Light">
38+
<Original>Flashlight</Original>
39+
<Russian>Фонарик</Russian>
40+
</Key>
41+
<Key ID="STR_CVO_CBA_Accessories_Side_Vis_LightLaser">
42+
<Original>Visible Laser + Flashlight</Original>
43+
<Russian>Видимый лазер + фонарик</Russian>
44+
</Key>
45+
</Container>
46+
<Container name="Explosives">
47+
<Key ID="STR_CVO_CBA_Explosives_ConvertFuse">
48+
<Original>Convert to short fuse</Original>
49+
<Russian>Поставить фитиль</Russian>
50+
</Key>
51+
<Key ID="STR_CVO_CBA_Explosives_RemoveFuse">
52+
<Original>Remove short fuse</Original>
53+
<Russian>Убрать фитиль</Russian>
54+
</Key>
55+
</Container>
56+
</Package>
57+
</Project>

‎cvo_compats_common/greenmag/ammo/10x25_Basic.hpp‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
class AMMO_CLASS(10x25_Basic_1Rnd) : CVO_GreenMag_Ammo_Core_1Rnd {
2+
displayName = __EVAL(format [LSTRING(Ammo_Basic_mm_Name), "10x25", 1]);
3+
descriptionShort = __EVAL(format [LSTRING(Ammo_Basic_mm_Desc), "10x25"]);
4+
5+
picture = "\z\greenmag\addons\main\data\9mm.paa";
6+
7+
scope = 2;
8+
9+
class ItemInfo : CBA_MiscItem_ItemInfo {
10+
mass = 0.22;
11+
};
12+
};
13+
14+
class AMMO_CLASS(10x25_Basic_10Rnd) : CVO_GreenMag_Ammo_Core_10Rnd {
15+
displayName = __EVAL(format [LSTRING(Ammo_Basic_mm_Name), "10x25", 10]);
16+
17+
scope = 2;
18+
19+
greenmag_ammotype = QAMMO_CLASS(10x25_Basic_1Rnd);
20+
21+
class ItemInfo : CBA_MiscItem_ItemInfo {
22+
mass = 2.2;
23+
};
24+
};
25+
26+
class AMMO_CLASS(10x25_Basic_20Rnd) : CVO_GreenMag_Ammo_Core_20Rnd {
27+
displayName = __EVAL(format [LSTRING(Ammo_Basic_mm_Name), "10x25", 20]);
28+
29+
scope = 2;
30+
31+
greenmag_ammotype = QAMMO_CLASS(10x25_Basic_1Rnd);
32+
33+
class ItemInfo : CBA_MiscItem_ItemInfo {
34+
mass = 4.4;
35+
};
36+
};
37+
38+
class AMMO_CLASS(10x25_Basic_30Rnd) : CVO_GreenMag_Ammo_Core_30Rnd {
39+
displayName = __EVAL(format [LSTRING(Ammo_Basic_mm_Name), "10x25", 30]);
40+
41+
scope = 2;
42+
scopeArsenal=2;
43+
scopeCurator=2;
44+
45+
greenmag_ammotype = QAMMO_CLASS(10x25_Basic_1Rnd);
46+
47+
class ItemInfo : CBA_MiscItem_ItemInfo {
48+
mass = 6.6;
49+
};
50+
};
51+
52+
class AMMO_CLASS(10x25_Basic_40Rnd) : CVO_GreenMag_Ammo_Core_40Rnd {
53+
displayName = __EVAL(format [LSTRING(Ammo_Basic_mm_Name), "10x25", 40]);
54+
55+
scope = 2;
56+
57+
greenmag_ammotype = QAMMO_CLASS(10x25_Basic_1Rnd);
58+
59+
class ItemInfo : CBA_MiscItem_ItemInfo {
60+
mass = 8.8;
61+
};
62+
};
63+
64+
class AMMO_CLASS(10x25_Basic_50Rnd) : CVO_GreenMag_Ammo_Core_50Rnd {
65+
displayName = __EVAL(format [LSTRING(Ammo_Basic_mm_Name), "10x25", 50]);
66+
67+
scope = 2;
68+
69+
greenmag_ammotype = QAMMO_CLASS(10x25_Basic_1Rnd);
70+
71+
class ItemInfo : CBA_MiscItem_ItemInfo {
72+
mass = 11.0;
73+
};
74+
};
75+
76+
class AMMO_CLASS(10x25_Basic_60Rnd) : CVO_GreenMag_Ammo_Core_60Rnd {
77+
displayName = __EVAL(format [LSTRING(Ammo_Basic_mm_Name), "10x25", 60]);
78+
79+
scope = 2;
80+
scopeArsenal=2;
81+
scopeCurator=2;
82+
83+
greenmag_ammotype = QAMMO_CLASS(10x25_Basic_1Rnd);
84+
85+
class ItemInfo : CBA_MiscItem_ItemInfo {
86+
mass = 13.2;
87+
};
88+
};

‎cvo_compats_common/greenmag/ammo/10x25_FMJ.hpp‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
class AMMO_CLASS(10x25_FMJ_1Rnd) : CVO_GreenMag_Ammo_Core_1Rnd {
2+
displayName = __EVAL(format [LSTRING(Ammo_Complex_mm_Name), "10x25", 1, LSTRING(Ammo_FMJ_Short)]);
3+
descriptionShort = __EVAL(format [LSTRING(Ammo_Complex_mm_Desc), "10x25", LSTRING(Ammo_FMJ_Full)]);
4+
5+
picture = "\z\greenmag\addons\main\data\9mm.paa";
6+
7+
scope = 2;
8+
9+
class ItemInfo : CBA_MiscItem_ItemInfo {
10+
mass = 0.22;
11+
};
12+
};
13+
14+
class AMMO_CLASS(10x25_FMJ_10Rnd) : CVO_GreenMag_Ammo_Core_10Rnd {
15+
displayName = __EVAL(format [LSTRING(Ammo_Complex_mm_Name), "10x25", 10, LSTRING(Ammo_FMJ_Short)]);
16+
17+
scope = 2;
18+
19+
greenmag_ammotype = QAMMO_CLASS(10x25_FMJ_1Rnd);
20+
21+
class ItemInfo : CBA_MiscItem_ItemInfo {
22+
mass = 2.2;
23+
};
24+
};
25+
26+
class AMMO_CLASS(10x25_FMJ_20Rnd) : CVO_GreenMag_Ammo_Core_20Rnd {
27+
displayName = __EVAL(format [LSTRING(Ammo_Complex_mm_Name), "10x25", 20, LSTRING(Ammo_FMJ_Short)]);
28+
29+
scope = 2;
30+
31+
greenmag_ammotype = QAMMO_CLASS(10x25_FMJ_1Rnd);
32+
33+
class ItemInfo : CBA_MiscItem_ItemInfo {
34+
mass = 4.4;
35+
};
36+
};
37+
38+
class AMMO_CLASS(10x25_FMJ_30Rnd) : CVO_GreenMag_Ammo_Core_30Rnd {
39+
displayName = __EVAL(format [LSTRING(Ammo_Complex_mm_Name), "10x25", 30, LSTRING(Ammo_FMJ_Short)]);
40+
41+
scope = 2;
42+
scopeArsenal=2;
43+
scopeCurator=2;
44+
45+
greenmag_ammotype = QAMMO_CLASS(10x25_FMJ_1Rnd);
46+
47+
class ItemInfo : CBA_MiscItem_ItemInfo {
48+
mass = 6.6;
49+
};
50+
};
51+
52+
class AMMO_CLASS(10x25_FMJ_40Rnd) : CVO_GreenMag_Ammo_Core_40Rnd {
53+
displayName = __EVAL(format [LSTRING(Ammo_Complex_mm_Name), "10x25", 40, LSTRING(Ammo_FMJ_Short)]);
54+
55+
scope = 2;
56+
57+
greenmag_ammotype = QAMMO_CLASS(10x25_FMJ_1Rnd);
58+
59+
class ItemInfo : CBA_MiscItem_ItemInfo {
60+
mass = 8.8;
61+
};
62+
};
63+
64+
class AMMO_CLASS(10x25_FMJ_50Rnd) : CVO_GreenMag_Ammo_Core_50Rnd {
65+
displayName = __EVAL(format [LSTRING(Ammo_Complex_mm_Name), "10x25", 50, LSTRING(Ammo_FMJ_Short)]);
66+
67+
scope = 2;
68+
69+
greenmag_ammotype = QAMMO_CLASS(10x25_FMJ_1Rnd);
70+
71+
class ItemInfo : CBA_MiscItem_ItemInfo {
72+
mass = 11.0;
73+
};
74+
};
75+
76+
class AMMO_CLASS(10x25_FMJ_60Rnd) : CVO_GreenMag_Ammo_Core_60Rnd {
77+
displayName = __EVAL(format [LSTRING(Ammo_Complex_mm_Name), "10x25", 60, LSTRING(Ammo_FMJ_Short)]);
78+
79+
scope = 2;
80+
scopeArsenal=2;
81+
scopeCurator=2;
82+
83+
greenmag_ammotype = QAMMO_CLASS(10x25_FMJ_1Rnd);
84+
85+
class ItemInfo : CBA_MiscItem_ItemInfo {
86+
mass = 13.2;
87+
};
88+
};

‎cvo_compats_common/greenmag/ammo/10x25_Tracer.hpp‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
class AMMO_CLASS(10x25_Tracer_1Rnd) : CVO_GreenMag_Ammo_Core_1Rnd {
2+
displayName = __EVAL(format [LSTRING(Ammo_Complex_mm_Name), "10x25", 1, LSTRING(Ammo_Tracer_Short)]);
3+
descriptionShort = __EVAL(format [LSTRING(Ammo_Complex_mm_Desc), "10x25", LSTRING(Ammo_Tracer_Full)]);
4+
5+
picture = "\z\greenmag\addons\main\data\9mm.paa";
6+
7+
scope = 2;
8+
9+
class ItemInfo : CBA_MiscItem_ItemInfo {
10+
mass = 0.22;
11+
};
12+
};
13+
14+
class AMMO_CLASS(10x25_Tracer_10Rnd) : CVO_GreenMag_Ammo_Core_10Rnd {
15+
displayName = __EVAL(format [LSTRING(Ammo_Complex_mm_Name), "10x25", 10, LSTRING(Ammo_Tracer_Short)]);
16+
17+
scope = 2;
18+
19+
greenmag_ammotype = QAMMO_CLASS(10x25_Tracer_1Rnd);
20+
21+
class ItemInfo : CBA_MiscItem_ItemInfo {
22+
mass = 2.2;
23+
};
24+
};
25+
26+
class AMMO_CLASS(10x25_Tracer_20Rnd) : CVO_GreenMag_Ammo_Core_20Rnd {
27+
displayName = __EVAL(format [LSTRING(Ammo_Complex_mm_Name), "10x25", 20, LSTRING(Ammo_Tracer_Short)]);
28+
29+
scope = 2;
30+
31+
greenmag_ammotype = QAMMO_CLASS(10x25_Tracer_1Rnd);
32+
33+
class ItemInfo : CBA_MiscItem_ItemInfo {
34+
mass = 4.4;
35+
};
36+
};
37+
38+
class AMMO_CLASS(10x25_Tracer_30Rnd) : CVO_GreenMag_Ammo_Core_30Rnd {
39+
displayName = __EVAL(format [LSTRING(Ammo_Complex_mm_Name), "10x25", 30, LSTRING(Ammo_Tracer_Short)]);
40+
41+
scope = 2;
42+
scopeArsenal=2;
43+
scopeCurator=2;
44+
45+
greenmag_ammotype = QAMMO_CLASS(10x25_Tracer_1Rnd);
46+
47+
class ItemInfo : CBA_MiscItem_ItemInfo {
48+
mass = 6.6;
49+
};
50+
};
51+
52+
class AMMO_CLASS(10x25_Tracer_40Rnd) : CVO_GreenMag_Ammo_Core_40Rnd {
53+
displayName = __EVAL(format [LSTRING(Ammo_Complex_mm_Name), "10x25", 40, LSTRING(Ammo_Tracer_Short)]);
54+
55+
scope = 2;
56+
57+
greenmag_ammotype = QAMMO_CLASS(10x25_Tracer_1Rnd);
58+
59+
class ItemInfo : CBA_MiscItem_ItemInfo {
60+
mass = 8.8;
61+
};
62+
};
63+
64+
class AMMO_CLASS(10x25_Tracer_50Rnd) : CVO_GreenMag_Ammo_Core_50Rnd {
65+
displayName = __EVAL(format [LSTRING(Ammo_Complex_mm_Name), "10x25", 50, LSTRING(Ammo_Tracer_Short)]);
66+
67+
scope = 2;
68+
69+
greenmag_ammotype = QAMMO_CLASS(10x25_Tracer_1Rnd);
70+
71+
class ItemInfo : CBA_MiscItem_ItemInfo {
72+
mass = 11.0;
73+
};
74+
};
75+
76+
class AMMO_CLASS(10x25_Tracer_60Rnd) : CVO_GreenMag_Ammo_Core_60Rnd {
77+
displayName = __EVAL(format [LSTRING(Ammo_Complex_mm_Name), "10x25", 60, LSTRING(Ammo_Tracer_Short)]);
78+
79+
scope = 2;
80+
scopeArsenal=2;
81+
scopeCurator=2;
82+
83+
greenmag_ammotype = QAMMO_CLASS(10x25_Tracer_1Rnd);
84+
85+
class ItemInfo : CBA_MiscItem_ItemInfo {
86+
mass = 13.2;
87+
};
88+
};

0 commit comments

Comments
 (0)