Skip to content

Commit 78cee3e

Browse files
committed
Formatting, disable VBIeds
1 parent a403745 commit 78cee3e

File tree

141 files changed

+5725
-6292
lines changed

Some content is hidden

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

141 files changed

+5725
-6292
lines changed

.hemtt/project.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,3 @@ include = [
1313

1414
[version]
1515
git_hash = 0
16-
17-

addons/equipment/CfgVehicles.hpp

Lines changed: 38 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,42 @@
11
class CBA_Extended_EventHandlers;
22
class CfgVehicles {
3-
class Item_Base_F;
4-
class Box_NATO_Equip_F;
5-
class GVAR(Box):Box_NATO_Equip_F {
6-
author = "prisoner";
7-
displayName = CSTRING(EquipmentBox_displayName);
8-
editorCategory = "IEDD_MAINCATEGORY";
9-
editorSubcategory = "IEDD_EQUIPMENT";
10-
vehicleClass = "IEDD_EQUIPMENT";
11-
scope = 2; //Scope 2 will show in editor
12-
scopeCurator = 2;
13-
class TransportWeapons {
14-
IEDD_ADDWEAPON(ACE_VMH3,1);
15-
IEDD_ADDWEAPON(ACE_VMM3,1);
16-
};
17-
18-
class TransportMagazines {
19-
IEDD_ADDMAGAZINE(Chemlight_Blue,10);
20-
IEDD_ADDMAGAZINE(Chemlight_Green,10);
21-
IEDD_ADDMAGAZINE(Chemlight_Red,10);
22-
IEDD_ADDMAGAZINE(Chemlight_Yellow,10);
23-
IEDD_ADDMAGAZINE(SmokeShell,10);
24-
IEDD_ADDMAGAZINE(SmokeShellBlue,10);
25-
IEDD_ADDMAGAZINE(SmokeShellGreen,10);
26-
IEDD_ADDMAGAZINE(SmokeShellRed,10);
27-
IEDD_ADDMAGAZINE(SmokeShellYellow,10);
28-
IEDD_ADDMAGAZINE(DemoCharge_Remote_Mag,20);
29-
IEDD_ADDMAGAZINE(SatchelCharge_Remote_Mag,10);
30-
};
31-
class TransportItems {
32-
IEDD_ADDITEM(iedd_item_notebook,1);
33-
IEDD_ADDITEM(ACE_wirecutter,2);
34-
IEDD_ADDITEM(ACE_Clacker,2);
35-
IEDD_ADDITEM(ACE_M26_Clacker,2);
36-
IEDD_ADDITEM(ACE_DefusalKit,2);
37-
IEDD_ADDITEM(ace_marker_flags_blue,10);
38-
IEDD_ADDITEM(ace_marker_flags_green,10);
39-
IEDD_ADDITEM(ace_marker_flags_red,10);
40-
IEDD_ADDITEM(ace_marker_flags_yellow,10);
41-
IEDD_ADDITEM(ACE_SpraypaintBlue,2);
42-
IEDD_ADDITEM(ACE_SpraypaintBlack,2);
43-
IEDD_ADDITEM(ACE_SpraypaintRed,2);
44-
IEDD_ADDITEM(ACE_SpraypaintGreen,2);
45-
IEDD_ADDITEM(ACE_Sandbag_empty,20);
46-
IEDD_ADDITEM(ACE_EntrenchingTool,2);
47-
IEDD_ADDITEM(ACE_Flashlight_XL50,2);
48-
IEDD_ADDITEM(Binocular,1);
49-
IEDD_ADDITEM(MineDetector,1);
50-
};
51-
class TransportBackpacks {};
52-
};
53-
class iedd_Item_Base: Item_Base_F {
54-
author = AUTHOR;
55-
scope = 0;
56-
scopeCurator = 0;
57-
scopeArsenal = 0;
58-
editorCategory = "IEDD_MAINCATEGORY";
59-
editorSubcategory = "IEDD_ITEMS";
60-
vehicleClass = "IEDD_ITEMS";
61-
};
62-
class iedd_Item_Notebook: iedd_Item_Base {
63-
type = 1;
64-
scope = 2; //Scope 2 will show in editor
65-
scopeCurator = 2;
66-
displayName = ECSTRING(main,Category_Main);
67-
descriptionShort = CSTRING(descriptionShort);
68-
picture = QPATHTOEF(models,preview\notebook.paa); //Displays icon in your Inventory
69-
model = QPATHTOEF(models,data\IEDD_notebook.p3d);
70-
icon = QPATHTOEF(models,preview\notebook.paa); //Leave as is "iconObject_circle"
71-
editorPreview = QPATHTOEF(models,preview\notebook.paa);
72-
ace_dragging_canDrag = 0;
73-
ace_dragging_canCarry = 0;
74-
class TransportItems {
75-
IEDD_ADDITEM(iedd_item_notebook,1);
76-
};
77-
class ACE_Actions {
78-
class ACE_MainActions {
79-
displayName = CSTRING(PickUp);
80-
icon = "\a3\ui_f\data\igui\cfg\actions\take_ca.paa";
81-
distance = 2;
82-
position = "";
83-
condition = QUOTE(true);
84-
statement = QUOTE([ARR_2(_player,_target)] call EFUNC(notebook,pick));
85-
};
86-
};
87-
class EventHandlers {
3+
class Item_Base_F;
4+
class iedd_Item_Base: Item_Base_F {
5+
author = ECSTRING(main,author);
6+
scope = 0;
7+
scopeCurator = 0;
8+
scopeArsenal = 0;
9+
editorCategory = "IEDD_MAINCATEGORY";
10+
editorSubcategory = "IEDD_ITEMS";
11+
vehicleClass = "IEDD_ITEMS";
12+
};
13+
class iedd_Item_Notebook: iedd_Item_Base {
14+
type = 1;
15+
scope = 2; //Scope 2 will show in editor
16+
scopeCurator = 2;
17+
displayName = ECSTRING(main,Category_Main);
18+
descriptionShort = CSTRING(descriptionShort);
19+
picture = QPATHTOEF(models,preview\notebook.paa); //Displays icon in your Inventory
20+
model = QPATHTOEF(models,data\IEDD_notebook.p3d);
21+
icon = QPATHTOEF(models,preview\notebook.paa); //Leave as is "iconObject_circle"
22+
editorPreview = QPATHTOEF(models,preview\notebook.paa);
23+
ace_dragging_canDrag = 0;
24+
ace_dragging_canCarry = 0;
25+
class TransportItems {
26+
IEDD_ADDITEM(iedd_item_notebook,1);
27+
};
28+
class ACE_Actions {
29+
class ACE_MainActions {
30+
displayName = CSTRING(PickUp);
31+
icon = "\a3\ui_f\data\igui\cfg\actions\take_ca.paa";
32+
distance = 2;
33+
position = "";
34+
condition = QUOTE(true);
35+
statement = QUOTE([ARR_2(_player,_target)] call EFUNC(notebook,pick));
36+
};
37+
};
38+
class EventHandlers {
8839
class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
8940
};
90-
};
91-
};
41+
};
42+
};

addons/equipment/config.cpp

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,23 @@
11
#include "script_component.hpp"
22
class CfgPatches {
3-
class ADDON {
4-
author = AUTHOR;
5-
authors[] = {"Prisoner","Lion"};
6-
name = COMPONENT_NAME;
7-
units[] = {
8-
"iedd_equipment_Base",
9-
"iedd_equipment_Box",
3+
class ADDON {
4+
author = ECSTRING(main,author);
5+
authors[] = {"Prisoner","Lion"};
6+
name = COMPONENT_NAME;
7+
units[] = {
8+
"iedd_equipment_Base",
109
"iedd_item_Base",
11-
"iedd_item_Notebook",
12-
"iedd_equipment_mine"
10+
"iedd_item_Notebook",
11+
"iedd_equipment_mine"
1312
};
14-
weapons[] = {
15-
"iedd_item_notebook"
16-
};
17-
requiredVersion = REQUIRED_VERSION;
18-
requiredAddons[] = {
19-
"A3_Characters_F",
20-
"A3_Supplies_F_Exp_Ammoboxes",
21-
"ace_main",
22-
"iedd_main"
13+
weapons[] = {
14+
"iedd_item_notebook"
2315
};
24-
url = "https://community.bistudio.com/wiki";
25-
VERSION_CONFIG;
26-
};
16+
requiredVersion = REQUIRED_VERSION;
17+
requiredAddons[] = {"iedd_main"};
18+
url = "https://github.com/prisonerMO/iedd";
19+
VERSION_CONFIG;
20+
};
2721
};
2822

2923
#include "CfgEventHandlers.hpp"

addons/equipment/stringtable.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project name="IEDD">
33
<Package name="Equipment">
4-
<Key ID="STR_iedd_equipment_EquipmentBox_displayName">
5-
<Original>IEDD Equipment Box</Original>
6-
<English>IEDD Equipment Box</English>
7-
</Key>
84
<Key ID="STR_iedd_equipment_PickUp">
95
<Original>Pick Up</Original>
106
<English>Pick Up</English>

addons/ied/CfgAmmo.hpp

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
class CfgAmmo {
2-
class DemoCharge_Remote_Ammo;
3-
class SmokeShellRed;
4-
class R_PG32V_F;
5-
class GVAR(Charge_Ammo):DemoCharge_Remote_Ammo {
6-
author = AUTHOR;
7-
scope = 1;
8-
mass = 0;
9-
displayName = CSTRING(Charge_Ammo_DisplayName);
10-
};
11-
class GVAR(Training_IED_Ammo):SmokeShellRed {
12-
explosionTime=0.00001;
13-
timeToLive=4;
14-
SmokeShellSoundLoop1[]=
15-
{
16-
"x\iedd\addons\ied\sounds\whistle.wss",
17-
100,
18-
1,
19-
15
20-
};
21-
grenadeBurningSound[]=
22-
{
23-
"SmokeShellSoundLoop1",
24-
1.0
25-
};
26-
/*
27-
*/
28-
};
29-
class GVAR(Tiny_Ammo): R_PG32V_F {
30-
author = AUTHOR;
31-
hit = 3;
32-
indirectHit = 2;
33-
indirectHitRange = 10;
34-
};
1+
class CfgAmmo {
2+
class DemoCharge_Remote_Ammo;
3+
class SmokeShellRed;
4+
class R_PG32V_F;
5+
class GVAR(Charge_Ammo):DemoCharge_Remote_Ammo {
6+
author = ECSTRING(main,author);
7+
scope = 1;
8+
mass = 0;
9+
displayName = CSTRING(Charge_Ammo_DisplayName);
10+
};
11+
class GVAR(Training_IED_Ammo):SmokeShellRed {
12+
explosionTime=0.00001;
13+
timeToLive=4;
14+
SmokeShellSoundLoop1[]=
15+
{
16+
"x\iedd\addons\ied\sounds\whistle.wss",
17+
100,
18+
1,
19+
15
20+
};
21+
grenadeBurningSound[]=
22+
{
23+
"SmokeShellSoundLoop1",
24+
1.0
25+
};
26+
/*
27+
*/
28+
};
29+
class GVAR(Tiny_Ammo): R_PG32V_F {
30+
author = ECSTRING(main,author);
31+
hit = 3;
32+
indirectHit = 2;
33+
indirectHitRange = 10;
34+
};
3535
};
3636

addons/ied/CfgEden.hpp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,23 +53,23 @@ class Cfg3DEN {
5353
typeName = "NUMBER";
5454
condition = "objectControllable";
5555
class Values {
56-
class 1 {
56+
class 1 {
5757
name = CSTRING(Variation_1);
5858
value = 0;
5959
};
60-
class 2 {
60+
class 2 {
6161
name = CSTRING(Variation_2);
6262
value = 1;
6363
};
64-
class 3 {
64+
class 3 {
6565
name = CSTRING(Variation_3);
6666
value = 2;
6767
};
68-
class 4 {
68+
class 4 {
6969
name = CSTRING(Variation_4);
7070
value = 3;
7171
};
72-
class 5 {
72+
class 5 {
7373
name = CSTRING(Variation_5);
7474
value = 4;
7575
};
@@ -89,19 +89,19 @@ class Cfg3DEN {
8989
typeName = "NUMBER";
9090
condition = "objectControllable";
9191
class Values {
92-
class 1 {
92+
class 1 {
9393
name = CSTRING(Name_Tiny);
9494
value = 0;
9595
};
96-
class 2 {
96+
class 2 {
9797
name = CSTRING(Name_Small);
9898
value = 1;
9999
};
100-
class 3 {
100+
class 3 {
101101
name = CSTRING(Name_Medium);
102102
value = 2;
103103
};
104-
class 4 {
104+
class 4 {
105105
name = CSTRING(Name_Large);
106106
value = 3;
107107
};
@@ -222,15 +222,15 @@ class Cfg3DEN {
222222
defaultValue = QGVAR(defaultTimer);
223223
typeName = "NUMBER";
224224
class Values {
225-
class 1 {
225+
class 1 {
226226
name = CSTRING(Name_Disabled);
227227
value = 0;
228228
};
229-
class 2 {
229+
class 2 {
230230
name = CSTRING(Name_Enabled);
231231
value = 1;
232232
};
233-
class 3 {
233+
class 3 {
234234
name = CSTRING(Name_Random);
235235
value = 2;
236236
};
@@ -256,15 +256,15 @@ class Cfg3DEN {
256256
defaultValue = QGVAR(defaultRandomTimer);
257257
typeName = "NUMBER";
258258
class Values {
259-
class 1 {
259+
class 1 {
260260
name = CSTRING(Name_Disabled);
261261
value = 0;
262262
};
263-
class 2 {
263+
class 2 {
264264
name = CSTRING(Name_Enabled);
265265
value = 1;
266266
};
267-
class 3 {
267+
class 3 {
268268
name = CSTRING(Name_Random);
269269
value = 2;
270270
};
@@ -295,4 +295,4 @@ class Cfg3DEN {
295295
};
296296
};
297297
};
298-
};
298+
};

0 commit comments

Comments
 (0)