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.

Sign up for GitHub

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

Custom Armor Harrison #368

Merged
merged 2 commits into from
Feb 1, 2025
Merged

Custom Armor Harrison #368

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc3d61d
Custom Armor Harrison
OverYandere Jan 31, 2025
693ade2
Changelog Update
OverYandere Jan 31, 2025
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
16 changes: 12 additions & 4 deletions ...thPRC_AceArsenalExtended/data/aax_models/weapons/armour_custom/marines2/group1/config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Custom Marine Armor Group 1: Jade
//Custom Marine Armor Group 1: Jade, Harrison
class 34thPRC_ArmourCustom_Marines2_Jade_Uniform_Urban_Light
{
label = "[34thPRC] Custom Uniforms";
Expand All @@ -8,11 +8,15 @@ class 34thPRC_ArmourCustom_Marines2_Jade_Uniform_Urban_Light
{
alwaysSelectable = 1;
changeingame = 0;
values[]={"jade",};
values[]={"jade", "harrison"};
class jade
{
label = "Jade";
};
class harrison
{
label="Harrison";
};
};
class variant
{
Expand Down Expand Up @@ -84,7 +88,7 @@ class 34thPRC_ArmourCustom_Marines2_Jade_Uniform_Urban_Light
};
};

//Custom Marine Helmet Group 1: Jade, Ramirez, Conex
//Custom Marine Helmet Group 1: Jade, Ramirez, Conex, Harrison
class 34thPRC_ArmourCustom_Marines2_Jade_CH252_Urban
{
label = "[34thPRC] CH252 Custom Helmets";
Expand All @@ -94,7 +98,7 @@ class 34thPRC_ArmourCustom_Marines2_Jade_CH252_Urban
{
alwaysSelectable = 1;
changeingame = 0;
values[]={"jade", "ramirez", "conex"};
values[]={"jade", "ramirez", "conex", "harrison"};
class jade
{
label = "Jade";
Expand All @@ -107,6 +111,10 @@ class 34thPRC_ArmourCustom_Marines2_Jade_CH252_Urban
{
label = "Conex";
};
class harrison
{
label = "Harrison";
};
};
class camo
{
Expand Down
1 change: 1 addition & 0 deletions src/Addons/34thPRC_ArmourCustom/data/marines2/config_vehicles.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
#include "jade\config_vehicles.hpp"
#include "harrison\config_vehicles.hpp"
1 change: 1 addition & 0 deletions src/Addons/34thPRC_ArmourCustom/data/marines2/config_weapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "jade\config_weapons.hpp"
#include "ramirez\config_weapons.hpp"
#include "conex\config_weapons.hpp"
#include "harrison\config_weapons.hpp"
126 changes: 126 additions & 0 deletions src/Addons/34thPRC_ArmourCustom/data/marines2/harrison/arctic/config_vehicles.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
class 34thPRC_ArmourCustom_Marines2_Harrison_Trooper_Arctic_Light : 34thPRC_ArmourCustom_Marines2_Harrison_Trooper_Urban_Light
{
scope=1;
UniformClass="34thPRC_ArmourCustom_Marines2_Harrison_Trooper_Arctic_Light";
hiddenSelectionsTextures[]=
{
"34thPRC_ArmourStandard\data\marines2\arctic\Winter_UpperBDU.paa",
"34thPRC_ArmourStandard\data\marines2\arctic\Winter_LowerBDU.paa",
"34thPRC_ArmourStandard\data\marines2\arctic\Winter_TrooperCollar.paa",
"MA_Armor\data\Uniforms\Marine\data\Color_Variants\TrooperSoftpadding_CO.paa",
"MA_Armor\data\Uniforms\Marine\data\Color_Variants\TrooperArmorStraps_CO.paa",
"34thPRC_ArmourCustom\data\marines2\harrison\arctic\harrison_marine_upperarmor_arctic.paa",
"34thPRC_ArmourStandard\data\marines2\arctic\White_LowerArmor.paa",
"34thPRC_ArmourCustom\data\marines2\harrison\arctic\harrison_marine_shoulders_arctic.paa",
"34thPRC_ArmourCustom\data\marines2\harrison\arctic\harrison_marine_shoulders_arctic.paa",
"34thPRC_ArmourCustom\data\marines2\harrison\arctic\harrison_marine_shoulders_arctic.paa"
};
};
class 34thPRC_ArmourCustom_Marines2_Harrison_Trooper_Arctic_Medium : 34thPRC_ArmourCustom_Marines2_Harrison_Trooper_Urban_Medium
{
scope=1;
UniformClass="34thPRC_ArmourCustom_Marines2_Harrison_Trooper_Arctic_Medium";
hiddenSelectionsTextures[]=
{
"34thPRC_ArmourStandard\data\marines2\arctic\Winter_UpperBDU.paa",
"34thPRC_ArmourStandard\data\marines2\arctic\Winter_LowerBDU.paa",
"34thPRC_ArmourStandard\data\marines2\arctic\Winter_TrooperCollar.paa",
"MA_Armor\data\Uniforms\Marine\data\Color_Variants\TrooperSoftpadding_CO.paa",
"MA_Armor\data\Uniforms\Marine\data\Color_Variants\TrooperArmorStraps_CO.paa",
"34thPRC_ArmourCustom\data\marines2\harrison\arctic\harrison_marine_upperarmor_arctic.paa",
"34thPRC_ArmourStandard\data\marines2\arctic\White_LowerArmor.paa",
"34thPRC_ArmourCustom\data\marines2\harrison\arctic\harrison_marine_shoulders_arctic.paa",
"34thPRC_ArmourCustom\data\marines2\harrison\arctic\harrison_marine_shoulders_arctic.paa",
"34thPRC_ArmourCustom\data\marines2\harrison\arctic\harrison_marine_shoulders_arctic.paa"
};
};
class 34thPRC_ArmourCustom_Marines2_Harrison_Trooper_Arctic_Heavy : 34thPRC_ArmourCustom_Marines2_Harrison_Trooper_Urban_Heavy
{
scope=1;
UniformClass="34thPRC_ArmourCustom_Marines2_Harrison_Trooper_Arctic_Heavy";
hiddenSelectionsTextures[]=
{
"34thPRC_ArmourStandard\data\marines2\arctic\Winter_UpperBDU.paa",
"34thPRC_ArmourStandard\data\marines2\arctic\Winter_LowerBDU.paa",
"34thPRC_ArmourStandard\data\marines2\arctic\Winter_TrooperCollar.paa",
"MA_Armor\data\Uniforms\Marine\data\Color_Variants\TrooperSoftpadding_CO.paa",
"MA_Armor\data\Uniforms\Marine\data\Color_Variants\TrooperArmorStraps_CO.paa",
"34thPRC_ArmourCustom\data\marines2\harrison\arctic\harrison_marine_upperarmor_arctic.paa",
"34thPRC_ArmourStandard\data\marines2\arctic\White_LowerArmor.paa",
"34thPRC_ArmourCustom\data\marines2\harrison\arctic\harrison_marine_shoulders_arctic.paa",
"34thPRC_ArmourCustom\data\marines2\harrison\arctic\harrison_marine_shoulders_arctic.paa",
"34thPRC_ArmourCustom\data\marines2\harrison\arctic\harrison_marine_shoulders_arctic.paa"
};
};
class 34thPRC_ArmourCustom_Marines2_Harrison_Trooper_Arctic_NoShoulders : 34thPRC_ArmourCustom_Marines2_Harrison_Trooper_Urban_NoShoulders
{
scope=1;
UniformClass="34thPRC_ArmourCustom_Marines2_Harrison_Trooper_Arctic_NoShoulders";
hiddenSelectionsTextures[]=
{
"34thPRC_ArmourStandard\data\marines2\arctic\Winter_UpperBDU.paa",
"34thPRC_ArmourStandard\data\marines2\arctic\Winter_LowerBDU.paa",
"34thPRC_ArmourStandard\data\marines2\arctic\Winter_TrooperCollar.paa",
"MA_Armor\data\Uniforms\Marine\data\Color_Variants\TrooperSoftpadding_CO.paa",
"MA_Armor\data\Uniforms\Marine\data\Color_Variants\TrooperArmorStraps_CO.paa",
"34thPRC_ArmourCustom\data\marines2\harrison\arctic\harrison_marine_upperarmor_arctic.paa",
"34thPRC_ArmourStandard\data\marines2\arctic\White_LowerArmor.paa",
"34thPRC_ArmourCustom\data\marines2\harrison\arctic\harrison_marine_shoulders_arctic.paa",
"34thPRC_ArmourCustom\data\marines2\harrison\arctic\harrison_marine_shoulders_arctic.paa",
"34thPRC_ArmourCustom\data\marines2\harrison\arctic\harrison_marine_shoulders_arctic.paa"
};
};
class 34thPRC_ArmourCustom_Marines2_Harrison_Trooper_Arctic_Light_NoCollar : 34thPRC_ArmourCustom_Marines2_Harrison_Trooper_Urban_Light_NoCollar
{
scope=1;
UniformClass="34thPRC_ArmourCustom_Marines2_Harrison_Trooper_Arctic_Light_NoCollar";
hiddenSelectionsTextures[]=
{
"34thPRC_ArmourStandard\data\marines2\arctic\Winter_UpperBDU.paa",
"34thPRC_ArmourStandard\data\marines2\arctic\Winter_LowerBDU.paa",
"34thPRC_ArmourStandard\data\marines2\arctic\Winter_TrooperCollar.paa",
"MA_Armor\data\Uniforms\Marine\data\Color_Variants\TrooperSoftpadding_CO.paa",
"MA_Armor\data\Uniforms\Marine\data\Color_Variants\TrooperArmorStraps_CO.paa",
"34thPRC_ArmourCustom\data\marines2\harrison\arctic\harrison_marine_upperarmor_arctic.paa",
"34thPRC_ArmourStandard\data\marines2\arctic\White_LowerArmor.paa",
"34thPRC_ArmourCustom\data\marines2\harrison\arctic\harrison_marine_shoulders_arctic.paa",
"34thPRC_ArmourCustom\data\marines2\harrison\arctic\harrison_marine_shoulders_arctic.paa",
"34thPRC_ArmourCustom\data\marines2\harrison\arctic\harrison_marine_shoulders_arctic.paa"
};
};
class 34thPRC_ArmourCustom_Marines2_Harrison_Trooper_Arctic_Medium_NoCollar : 34thPRC_ArmourCustom_Marines2_Harrison_Trooper_Urban_Medium_NoCollar
{
scope=1;
UniformClass="34thPRC_ArmourCustom_Marines2_Harrison_Trooper_Arctic_Medium_NoCollar";
hiddenSelectionsTextures[]=
{
"34thPRC_ArmourStandard\data\marines2\arctic\Winter_UpperBDU.paa",
"34thPRC_ArmourStandard\data\marines2\arctic\Winter_LowerBDU.paa",
"34thPRC_ArmourStandard\data\marines2\arctic\Winter_TrooperCollar.paa",
"MA_Armor\data\Uniforms\Marine\data\Color_Variants\TrooperSoftpadding_CO.paa",
"MA_Armor\data\Uniforms\Marine\data\Color_Variants\TrooperArmorStraps_CO.paa",
"34thPRC_ArmourCustom\data\marines2\harrison\arctic\harrison_marine_upperarmor_arctic.paa",
"34thPRC_ArmourStandard\data\marines2\arctic\White_LowerArmor.paa",
"34thPRC_ArmourCustom\data\marines2\harrison\arctic\harrison_marine_shoulders_arctic.paa",
"34thPRC_ArmourCustom\data\marines2\harrison\arctic\harrison_marine_shoulders_arctic.paa",
"34thPRC_ArmourCustom\data\marines2\harrison\arctic\harrison_marine_shoulders_arctic.paa"
};
};
class 34thPRC_ArmourCustom_Marines2_Harrison_Trooper_Arctic_Heavy_NoCollar : 34thPRC_ArmourCustom_Marines2_Harrison_Trooper_Urban_Heavy_NoCollar
{
scope=1;
UniformClass="34thPRC_ArmourCustom_Marines2_Harrison_Trooper_Arctic_Heavy_NoCollar";
hiddenSelectionsTextures[]=
{
"34thPRC_ArmourStandard\data\marines2\arctic\Winter_UpperBDU.paa",
"34thPRC_ArmourStandard\data\marines2\arctic\Winter_LowerBDU.paa",
"34thPRC_ArmourStandard\data\marines2\arctic\Winter_TrooperCollar.paa",
"MA_Armor\data\Uniforms\Marine\data\Color_Variants\TrooperSoftpadding_CO.paa",
"MA_Armor\data\Uniforms\Marine\data\Color_Variants\TrooperArmorStraps_CO.paa",
"34thPRC_ArmourCustom\data\marines2\harrison\arctic\harrison_marine_upperarmor_arctic.paa",
"34thPRC_ArmourStandard\data\marines2\arctic\White_LowerArmor.paa",
"34thPRC_ArmourCustom\data\marines2\harrison\arctic\harrison_marine_shoulders_arctic.paa",
"34thPRC_ArmourCustom\data\marines2\harrison\arctic\harrison_marine_shoulders_arctic.paa",
"34thPRC_ArmourCustom\data\marines2\harrison\arctic\harrison_marine_shoulders_arctic.paa"
};
};
Loading