Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Militia #68

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions addons/characters_mil_o/$PBOPREFIX$
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
z\blackorder\addons\characters_mil_o
6 changes: 6 additions & 0 deletions addons/characters_mil_o/CfgGroups.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
class CfgGroups {
class East {
class OPF_BlackOrder_F {
};
};
};
228 changes: 228 additions & 0 deletions addons/characters_mil_o/CfgVehicles.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,228 @@
#define MACRO_MILITIABASE \
role="Rifleman"; \
\
genericNames = "EnglishMen"; \
icon = "iconMan"; \
identityTypes[] = {"LanguageENG_F","Head_NATO","G_BlackOrder_Militia"}; \
\
side = 0; \
faction = "OPF_BlackOrder_F"; \
\
modelSides[] = {6}; \
\
editorSubcategory = "EdSubcat_Personnel_Bandits"; \
\
headgearList[] = { \
"",2, \
"H_FakeHeadgear_Syndikat_F",5, \
"H_Bandanna_gry",1, \
"H_Bandanna_blu",1, \
"H_Bandanna_cbr",1, \
"H_Bandanna_khk",1, \
"H_Bandanna_sgg",1, \
"H_Bandanna_sand",1, \
"H_Bandanna_surfer_blk",1, \
"H_Bandanna_camo",1, \
"H_Booniehat_khk",1, \
"H_Booniehat_oli",1, \
"H_Booniehat_tan",1, \
"H_Cap_blk_Syndikat_F",1, \
"H_Cap_grn_Syndikat_F",1, \
"H_Cap_oli_Syndikat_F",1, \
"H_Cap_tan_Syndikat_F",1, \
"H_PASGT_basic_black_F",1, \
"H_PASGT_basic_olive_F",1, \
"H_Construction_basic_black_F",1, \
"H_BlackOrder_Cap_01",1, \
"H_Cap_blk",1, \
"H_Cap_blk_CMMG",1, \
"H_Cap_grn",1, \
"H_Cap_oli",1, \
"H_Cap_red",1, \
"H_Cap_tan",1, \
"H_RacingHelmet_1_black_F",1, \
"H_RacingHelmet_3_F",1, \
"H_RacingHelmet_4_F",1, \
"H_ShemagOpen_tan",1, \
"H_Shemag_olive",1, \
"H_Helmet_Skate",1, \
"H_ShemagOpen_khk",1, \
"H_ShemagOpen_khk",1, \
"H_ShemagOpen_khk",1 \
}

class CfgVehicles {

class SoldierGB;
class I_G_Soldier_base_F : SoldierGB {
modelSides[] = {6};
};
class I_Soldier_base_F : SoldierGB {
modelSides[] = {6};
};

class I_L_Criminal_SMG_F;
class O_BlackOrder_Mil_Militia_01_F : I_L_Criminal_SMG_F {
MACRO_MILITIABASE;

_generalMacro = "O_BlackOrder_Mil_Militia_01_F";
scope = 2;
scopeCurator = 2;
displayName = CSTRING(Militia_01_Display);
author = ECSTRING(common,BlackOrderTeam);
editorPreview = "\A3\EditorPreviews_F_Enoch\Data\CfgVehicles\I_L_Looter_Pistol_F.jpg";

backpack = "B_Messenger_Black_F";

weapons[] = {"srifle_DMR_03_blackorder_F","Throw","Put"};
magazines[] = {
MULT_OBJ_8(20Rnd_762x51_Mag)
};
respawnMagazines[] = {
MULT_OBJ_8(20Rnd_762x51_Mag)
};
items[] = {
MULT_OBJ_1(FirstAidKit)
};
respawnItems[] = {
MULT_OBJ_1(FirstAidKit)
};
linkedItems[] = {
"V_BlackOrder_PlainVest_F",
"ItemMap",
"ItemCompass",
"ItemWatch",
"ItemRadio"
};
respawnLinkedItems[] = {
"V_BlackOrder_PlainVest_F",
"ItemMap",
"ItemCompass",
"ItemWatch",
"ItemRadio"
};
};
class I_L_Looter_Rifle_F;
class O_BlackOrder_Mil_Militia_02_F : I_L_Looter_Rifle_F {
MACRO_MILITIABASE;

_generalMacro = "O_BlackOrder_Mil_Militia_02_F";
scope = 2;
scopeCurator = 2;
displayName = CSTRING(Militia_02_Display);
author = ECSTRING(common,BlackOrderTeam);
editorPreview = "\A3\EditorPreviews_F_Enoch\Data\CfgVehicles\I_L_Looter_Pistol_F.jpg";

backpack = "B_Messenger_Gray_F";

weapons[] = {"srifle_DMR_03_blackorder_F","Throw","Put"};
magazines[] = {
MULT_OBJ_8(20Rnd_762x51_Mag)
};
respawnMagazines[] = {
MULT_OBJ_8(20Rnd_762x51_Mag)
};
items[] = {
MULT_OBJ_1(FirstAidKit)
};
respawnItems[] = {
MULT_OBJ_1(FirstAidKit)
};
linkedItems[] = {
"V_BlackOrder_PlainVest_F",
"ItemMap",
"ItemCompass",
"ItemWatch",
"ItemRadio"
};
respawnLinkedItems[] = {
"V_BlackOrder_PlainVest_F",
"ItemMap",
"ItemCompass",
"ItemWatch",
"ItemRadio"
};
};
class I_C_Soldier_Bandit_3_F;
class O_BlackOrder_Mil_Militia_03_F : I_C_Soldier_Bandit_3_F {
MACRO_MILITIABASE;

_generalMacro = "O_BlackOrder_Mil_Militia_03_F";
scope = 2;
scopeCurator = 2;
displayName = CSTRING(Militia_03_Display);
author = ECSTRING(common,BlackOrderTeam);
editorPreview = "\A3\EditorPreviews_F_Enoch\Data\CfgVehicles\I_L_Looter_Pistol_F.jpg";

backpack = "B_Messenger_Olive_F";

weapons[] = {"srifle_DMR_03_blackorder_F","Throw","Put"};
magazines[] = {
MULT_OBJ_8(20Rnd_762x51_Mag)
};
respawnMagazines[] = {
MULT_OBJ_8(20Rnd_762x51_Mag)
};
items[] = {
MULT_OBJ_1(FirstAidKit)
};
respawnItems[] = {
MULT_OBJ_1(FirstAidKit)
};
linkedItems[] = {
"V_BlackOrder_PlainVest_F",
"ItemMap",
"ItemCompass",
"ItemWatch",
"ItemRadio"
};
respawnLinkedItems[] = {
"V_BlackOrder_PlainVest_F",
"ItemMap",
"ItemCompass",
"ItemWatch",
"ItemRadio"
};
};
class I_C_Soldier_Bandit_2_F;
class O_BlackOrder_Mil_Militia_04_F : I_C_Soldier_Bandit_2_F {
MACRO_MILITIABASE;

_generalMacro = "O_BlackOrder_Mil_Militia_04_F";
scope = 2;
scopeCurator = 2;
displayName = CSTRING(Militia_04_Display);
author = ECSTRING(common,BlackOrderTeam);
editorPreview = "\A3\EditorPreviews_F_Enoch\Data\CfgVehicles\I_L_Looter_Pistol_F.jpg";

backpack = "B_Messenger_Gray_F";

weapons[] = {"srifle_DMR_03_blackorder_F","Throw","Put"};
magazines[] = {
MULT_OBJ_8(20Rnd_762x51_Mag)
};
respawnMagazines[] = {
MULT_OBJ_8(20Rnd_762x51_Mag)
};
items[] = {
MULT_OBJ_1(FirstAidKit)
};
respawnItems[] = {
MULT_OBJ_1(FirstAidKit)
};
linkedItems[] = {
"V_BlackOrder_PlainVest_F",
"ItemMap",
"ItemCompass",
"ItemWatch",
"ItemRadio"
};
respawnLinkedItems[] = {
"V_BlackOrder_PlainVest_F",
"ItemMap",
"ItemCompass",
"ItemWatch",
"ItemRadio"
};
};
};
26 changes: 26 additions & 0 deletions addons/characters_mil_o/config.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#include "script_component.hpp"

class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
units[] = {
};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {
"blackorder_main",
"blackorder_common",

"blackorder_characters_o",
"blackorder_gear",
"blackorder_weapons"
};
author = ECSTRING(common,BlackOrderTeam);
authors[] = {"Brostrom.A (Evul)"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

#include "CfgVehicles.hpp"
#include "CfgGroups.hpp"
5 changes: 5 additions & 0 deletions addons/characters_mil_o/script_component.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#define COMPONENT characters_mil_o
#define COMPONENT_BEAUTIFIED Special Forces

#include "\z\blackorder\addons\main\script_mod.hpp"
#include "\z\blackorder\addons\main\script_macros.hpp"
19 changes: 19 additions & 0 deletions addons/characters_mil_o/stringtable.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<Project name="BlackOrder">
<Package name="Characters_Mil_O">
<Key ID="STR_BlackOrder_Characters_Mil_O_Militia_Display">
<English>Militia</English>
</Key>
<Key ID="STR_BlackOrder_Characters_Mil_O_Militia_01_Display">
<English>Militia (Soldier)</English>
</Key>
<Key ID="STR_BlackOrder_Characters_Mil_O_Militia_02_Display">
<English>Militia (Protector)</English>
</Key>
<Key ID="STR_BlackOrder_Characters_Mil_O_Militia_03_Display">
<English>Militia (Defender)</English>
</Key>
<Key ID="STR_BlackOrder_Characters_Mil_O_Militia_04_Display">
<English>Militia (Guardian)</English>
</Key>
</Package>
</Project>
12 changes: 12 additions & 0 deletions addons/gear/CfgWeapons.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,18 @@ class CfgWeapons {
};
};

class V_Plain_base_F;
class V_BlackOrder_PlainVest_F: V_Plain_base_F {
_generalMacro = "V_BlackOrder_PlainVest_F";
scope = 2;
displayName = CSTRING(Vest_PlainVest_Display);
author = ECSTRING(common,BlackOrderTeam);
picture = QPATHTOF(data\vest\icon\icon_V_BlackOrder_PlainVest_ca.paa);
hiddenSelectionsTextures[] = {
QPATHTOF(data\vest\V_BlackOrder_PlainVest_co.paa)
};
};


class HeadgearItem;
class H_HelmetB;
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 4 additions & 0 deletions addons/gear/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@
<Spanish>Cartuchera Ligera (Médico Black Order)</Spanish>
</Key>

<Key ID="STR_BlackOrder_Gear_Vest_PlainVest_Display">
<English>Identification Vest [Black Order]</English>
</Key>

<Key ID="STR_BlackOrder_Gear_Headgear_CombatHelmet_Display">
<English>Combat Helmet (Black Order)</English>
<Spanish>Casco de Combate (Black Order)</Spanish>
Expand Down