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

AAX Support for Immersion Cigs Rewrite #371

Merged
merged 4 commits into from
Feb 2, 2025
Merged
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
4 changes: 2 additions & 2 deletions src/Addons/34thPRC_AceArsenalExtended/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ class CfgPatches
"OPTRE_UNSC_Units", // [DEV] Operation Trebuchet
"TAC_VESTS_S", "TAC_VESTS", "TAC_VESTS_Z2", "TAC_VESTS_B", "ua_cap_tryk", "TAC_VESTS_US", "TAC_VESTS_W", //TAC-VESTS
"Kio_Balaclava", "US_ESS_Glasses_tryk", "maa_Uniform", "TRYK_Shemaghs", "TRYK_BackPack", "MULTIPLAY_Uniform", "TRYK_Uniform", //Multi-play Uniforms
"Halo_marine_02" //MA: TGE
"Halo_marine_02", //MA: TGE
"cigs_main", //Immersion Cigs - Rewrite
};
skipWhenMissingDependencies = 1;
};
};

class XtdGearModels
{
#include "data\aax_models\config.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
#include "arma3_bandana\config.hpp"
#include "ma_facewear\config.hpp"
#include "matge_balaclava\config.hpp"
#include "immersioncigs_rewrite\config.hpp"
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
class cigs_black_devil_cig0
{
model = "smokeables_and_suckables";
cigarbox = "blackdevil";
crayonbox = "";
lollipop = "";
};
class cigs_craven_cig0
{
model = "smokeables_and_suckables";
cigarbox = "craven";
crayonbox = "";
lollipop = "";
};
class cigs_cigars_cigar0
{
model = "smokeables_and_suckables";
cigarbox = "cigar";
crayonbox = "";
lollipop = "";
};
class cigs_eckstein_cig0
{
model = "smokeables_and_suckables";
cigarbox = "eckstein";
crayonbox = "";
lollipop = "";
};
class cigs_lucky_strike_cig0
{
model = "smokeables_and_suckables";
cigarbox = "luckystrike";
crayonbox = "";
lollipop = "";
};
class cigs_morley_cig0
{
model = "smokeables_and_suckables";
cigarbox = "morley";
crayonbox = "";
lollipop = "";
};
class cigs_baja_blast_cig0
{
model = "smokeables_and_suckables";
cigarbox = "mtndew";
crayonbox = "";
lollipop = "";
};
class cigs_crayons_crayon_black
{
model = "smokeables_and_suckables";
cigarbox = "";
crayonbox = "black";
lollipop = "";
};
class cigs_crayons_crayon_blue
{
model = "smokeables_and_suckables";
cigarbox = "";
crayonbox = "blue";
lollipop = "";
};
class cigs_crayons_crayon_brown
{
model = "smokeables_and_suckables";
cigarbox = "";
crayonbox = "brown";
lollipop = "";
};
class cigs_crayons_crayon_gray
{
model = "smokeables_and_suckables";
cigarbox = "";
crayonbox = "gray";
lollipop = "";
};
class cigs_crayons_crayon_green
{
model = "smokeables_and_suckables";
cigarbox = "";
crayonbox = "green";
lollipop = "";
};
class cigs_crayons_crayon_orange
{
model = "smokeables_and_suckables";
cigarbox = "";
crayonbox = "orange";
lollipop = "";
};
class cigs_crayons_crayon_pink
{
model = "smokeables_and_suckables";
cigarbox = "";
crayonbox = "pink";
lollipop = "";
};
class cigs_crayons_crayon_purple
{
model = "smokeables_and_suckables";
cigarbox = "";
crayonbox = "purple";
lollipop = "";
};
class cigs_crayons_crayon_red
{
model = "smokeables_and_suckables";
cigarbox = "";
crayonbox = "red";
lollipop = "";
};
class cigs_crayons_crayon_white
{
model = "smokeables_and_suckables";
cigarbox = "";
crayonbox = "white";
lollipop = "";
};
class cigs_crayons_crayon_yellow
{
model = "smokeables_and_suckables";
cigarbox = "";
crayonbox = "yellow";
lollipop = "";
};
class cigs_pops_pop0
{
model = "smokeables_and_suckables";
cigarbox = "";
crayonbox = "";
lollipop = "lollipop";
};
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
#include "arma3_bandana\config.hpp"
#include "ma_facewear\config.hpp"
#include "matge_balaclava\config.hpp"
#include "immersioncigs_rewrite\config.hpp"
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
class smokeables_and_suckables
{
label = "[ICR] Smokeables & Suckables";
author = "Zorn, Vespade, Kneely, Jenna, Rebel, Facel";
options[] = {"cigarbox", "crayonbox", "lollipop"};
class cigarbox
{
label = "Cigar Box";
alwaysSelectable = 1;
changeingame = 0;
values[] = {"blackdevil", "cigar", "craven", "eckstein", "luckystrike", "morely", "mtndew"};
class blackdevil
{
label = "Black Devil";
description = "Black Devil Pink Cigarette";
};
class cigar
{
label = "Cigar";
};
class craven
{
label = "Craven";
description = "Craven 'A' Cigarette";
};
class eckstein
{
label = "Eckstein";
description = "Eckstein No. 5 Cigarette";
};
class luckystrike
{
label = "Lucky Strike";
description = "Lucky Strike Cigarette";
};
class morley
{
label = "Morley";
description = "Morley Cigarette";
};
class mtndew
{
label = "Mtn Dew";
description = "Mtn Dew Baja Blast";
};
};
class crayonbox
{
label = "Crayon Box";
alwaysSelectable = 1;
changeingame = 0;
values[] = {"black", "blue", "brown", "gray", "green", "orange", "pink", "purple", "red", "white", "yellow"};
class black
{
label = "Black";
image = "#(rgb,8,8,3)color(0,0,0,1)";
};
class blue
{
label = "Blue";
image = "#(rgb,8,8,3)color(0.1,0.1,0.5,1)";
};
class brown
{
label = "Brown";
image = "#(rgb,8,8,3)color(0.55,0.27,0.07,0.5)";
};
class gray
{
label = "Gray";
image = "#(rgb,8,8,3)color(0.5,0.5,0.5,0.75)";
};
class green
{
label = "Green";
image = "#(rgb,8,8,3)color(0,0.39,0,1)";
};
class orange
{
label = "Orange";
image = "#(rgb,8,8,3)color(1,0.3,0,1)";
};
class pink
{
label = "Pink";
image = "#(rgb,8,8,3)color(1,0,1,1)";
};
class purple
{
label = "Purple";
image = "#(rgb,8,8,3)color(0.29,0,0.51,1)";
};
class red
{
label = "Red";
image = "#(rgb,8,8,3)color(1,0,0,0.5)";
};
class white
{
label = "White";
image = "#(rgb,8,8,3)color(1,1,1,1)";
};
class yellow
{
label = "Yellow";
image = "#(rgb,8,8,3)color(1,1,0,1)";
};
};
class lollipop
{
label = "Lollipop";
alwaysSelectable = 1;
changeingame = 0;
values[] = {"lollipop"};
class lollipop
{
label = "Lollipop";
};
};
};
1 change: 1 addition & 0 deletions src/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Series-9 SOLA Jump-Jet (Halo variant of the Scion Conflict jumppack which includes a Gunbag and Long-Range Radio.)
- Series-9 GH SOLA Jump-Jet (Alt version of the above with grapplinghook functionality from Scion Conflict)
- Ace Arsenal Extended support for Immersion Cigs - Rewrite
### Updated
- Added black hot thermals to HUL Gen 3 variants to make them leadership available
- Yandere Recon Custom Helm
Expand Down