Skip to content

Commit

Permalink
Split CTRG cases from FIA/NATO
Browse files Browse the repository at this point in the history
  • Loading branch information
@NikkoJT
NikkoJT committed Aug 4, 2019
1 parent 8f30a90 commit e53145d
Show file tree
Hide file tree
Showing 3 changed files with 91 additions and 8 deletions.
22 changes: 19 additions & 3 deletions f/assignGear/f_assignInsignia.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ switch (_insignia_style_CSAT) do
case "Urban" : {_CSAT_Medic_Badge = "CSAT_Urban_Medic_Badge";};
};

// Treat CTRG like BLUFOR
if (_faction in ["blu_ctrg_f","ctrg"]) then {_faction = "blu_f"};

// ===================================================================================

// Assign Insignia based on type of the unit.
Expand All @@ -52,6 +49,7 @@ private _roleBadge = switch (_typeofUnit) do
case (_faction in ["opf_t_f","csatpacific"]) : {"CSAT_Pacific_Medic_Badge"};
case (_faction in ["ind_f","ind_e_f","aaf","ldf"]) : {"AAF_Medic_Badge"};
case (_faction in ["opf_r_f","spetsnaz"]) : {"CSAT_Pacific_Medic_Badge"};
case (_faction in ["blu_ctrg_f","ctrg"]) : {_NATO_Medic_Badge"};
default {"NATO_Medic_Badge"};
};
};
Expand Down Expand Up @@ -254,6 +252,24 @@ switch (true) do
["GrpLDF_DC","AAF_DC_Badge"]
];
};
case (_faction in ["blu_ctrg_f","ctrg"]): {
_groupBadges = [
["GrpCTRG_ASL","NATO_ASL_Badge"],
["GrpCTRG_A1","NATO_A1_Badge"],
["GrpCTRG_A2","NATO_A2_Badge"],
["GrpCTRG_A3","NATO_A3_Badge"],
["GrpCTRG_BSL","NATO_BSL_Badge"],
["GrpCTRG_B1","NATO_B1_Badge"],
["GrpCTRG_B2","NATO_B2_Badge"],
["GrpCTRG_B3","NATO_B3_Badge"],
["GrpCTRG_CSL","NATO_CSL_Badge"],
["GrpCTRG_C1","NATO_C1_Badge"],
["GrpCTRG_C2","NATO_C2_Badge"],
["GrpCTRG_C3","NATO_C3_Badge"],
["GrpCTRG_CO","NATO_CO_Badge"],
["GrpCTRG_DC","NATO_DC_Badge"]
];
};
case (_faction in ["blu_g_f","opf_g_f","ind_g_f","fia"]) : {
_groupBadges = [
["GrpFIA_ASL","NATO_ASL_Badge"],
Expand Down
14 changes: 9 additions & 5 deletions f/groupMarkers/f_setLocalGroupMarkers.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ params [
private _groups = [];

// Markers seen by players in NATO, NATO (Pacific) & CTRG slots.
if (_unitfaction in ["blu_f","blu_t_f","blu_ctrg_f","blu_w_f","nato","natowoodland","natopacific"]) then {
if (_unitfaction in ["blu_f","blu_t_f","blu_w_f","nato","natowoodland","natopacific"]) then {
_groups = f_var_groupData_blufor_nato;
};

// Markers seen by players in FIA & CTRG slots. Add "fia" if using "fia" with Virtual Faction.
if (_unitfaction in ["blu_g_f","blu_ctrg_f","ctrg"]) then {
// Markers seen by players in FIA & CTRG slots. Move "fia" to OPFOR FIA or INDFOR FIA if using them.
if (_unitfaction in ["blu_g_f","fia"]) then {
_groups = f_var_groupData_blufor_fia;
};

Expand All @@ -37,12 +37,16 @@ if (_unitfaction in ["blu_gen_f"]) then {
_groups = f_var_groupData_blufor_gen;
};

if (_unitfaction in ["blu_ctrg_f","ctrg"]) then {
_groups = f_var_groupData_blufor_ctrg;
};

// Markers seen by players in CSAT & CSAT (Pacific) slots.
if (_unitfaction in ["opf_f","opf_t_f","csat","csatpacific"]) then {
_groups = f_var_groupData_opfor_csat;
};

// Markers seen by players in OPFOR-FIA slots. Add "fia" if using "fia" with Virtual Faction.
// Markers seen by players in OPFOR-FIA slots. Add "fia" if using "fia" with Virtual Faction, and remove it from BLUFOR FIA.
if (_unitfaction in ["opf_g_f"]) then {
_groups = f_var_groupData_opfor_fia;
};
Expand All @@ -67,7 +71,7 @@ if (_unitfaction in ["ind_e_f","ldf"]) then {
_groups = f_var_groupData_indfor_ldf;
};

// Markers seen by players in INDEPENDENT-FIA slots. Add "fia" if using "fia" with Virtual Faction.
// Markers seen by players in INDEPENDENT-FIA slots. Add "fia" if using "fia" with Virtual Faction, and remove it from BLUFOR FIA.
if (_unitfaction in ["ind_g_f"]) then {
_groups = f_var_groupData_indfor_fia;
};
Expand Down
63 changes: 63 additions & 0 deletions f/groupMarkers/fn_groupData.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,68 @@ f_var_groupData_blufor_gen = [
["GrpGEN_TH1", _hel, "TH1", "ColorOrange", "Gendarmerie TH1 -"]
];

f_var_groupData_blufor_ctrg = [
["GrpCTRG_CO", _hq, "CO", "ColorYellow", "CTRG CO -"],
["GrpCTRG_DC", _hq, "DC", "ColorYellow", "CTRG DC -"],
["GrpCTRG_COV", _ifv, "COV", "ColorYellow", "CTRG COV -"],

["GrpCTRG_ASL", _hq, "ASL", "ColorRed", "CTRG ASL -"],
["GrpCTRG_A1", _ft, "A1", "ColorRed", "CTRG A1 -"],
["GrpCTRG_A2", _ft, "A2", "ColorRed", "CTRG A2 -"],
["GrpCTRG_AV", _ifv, "AV", "ColorRed", "CTRG AV -"],

["GrpCTRG_BSL", _hq, "BSL", "ColorBlue", "CTRG BSL -"],
["GrpCTRG_B1", _ft, "B1", "ColorBlue", "CTRG B1 -"],
["GrpCTRG_B2", _ft, "B2", "ColorBlue", "CTRG B2 -"],
["GrpCTRG_BV", _ifv, "BV", "ColorBlue", "CTRG BV -"],

["GrpCTRG_CSL", _hq, "CSL", "ColorGreen", "CTRG CSL -"],
["GrpCTRG_C1", _ft, "C1", "ColorGreen", "CTRG C1 -"],
["GrpCTRG_C2", _ft, "C2", "ColorGreen", "CTRG C2 -"],
["GrpCTRG_CV", _ifv, "CV", "ColorGreen", "CTRG CV -"],

["GrpCTRG_JSL", _hq, "JSL", "ColorPink", "CTRG JSL -"],
["GrpCTRG_J1", _ft, "J1", "ColorPink", "CTRG J1 -"],
["GrpCTRG_J2", _ft, "J2", "ColorPink", "CTRG J2 -"],
["GrpCTRG_JV", _ifv, "JV", "ColorPink", "CTRG JV -"],

["GrpCTRG_MMG1", _sup, "MMG1", "ColorOrange", "CTRG MMG1 -"],
["GrpCTRG_MMG2", _sup, "MMG2", "ColorOrange", "CTRG MMG2 -"],
["GrpCTRG_HMG1", _sup, "HMG1", "ColorOrange", "CTRG HMG1 -"],
["GrpCTRG_MAT1", _lau, "MAT1", "ColorOrange", "CTRG MAT1 -"],
["GrpCTRG_MAT2", _lau, "MAT2", "ColorOrange", "CTRG MAT2 -"],
["GrpCTRG_HAT1", _lau, "HAT1", "ColorOrange", "CTRG HAT1 -"],
["GrpCTRG_MTR1", _mor, "MTR1", "ColorOrange", "CTRG MTR1 -"],
["GrpCTRG_MSAM1", _lau, "MSAM1", "ColorOrange", "CTRG MSAM1 -"],
["GrpCTRG_HSAM1", _lau, "HSAM1", "ColorOrange", "CTRG HSAM1 -"],
["GrpCTRG_ST1", _rec, "ST1", "ColorOrange", "CTRG ST1 -"],
["GrpCTRG_DT1", _rec, "DT1", "ColorOrange", "CTRG DT1 -"],
["GrpCTRG_ENG1", _eng, "ENG1", "ColorOrange", "CTRG ENG1 -"],

["GrpCTRG_IFV1", _ifv, "IFV1", "ColorOrange", "CTRG IFV1 -"],
["GrpCTRG_IFV2", _ifv, "IFV2", "ColorOrange", "CTRG IFV2 -"],
["GrpCTRG_TNK1", _tnk, "TNK1", "ColorRed", "CTRG TNK1 -"],

["GrpCTRG_CAS1", _pla, "CAS1", "ColorOrange", "CTRG CAS1 -"],

["GrpCTRG_TH1", _hel, "TH1", "ColorRed", "CTRG TH1 -"],
["GrpCTRG_TH2", _hel, "TH2", "ColorRed", "CTRG TH2 -"],
["GrpCTRG_TH3", _hel, "TH3", "ColorBlue", "CTRG TH3 -"],
["GrpCTRG_TH4", _hel, "TH4", "ColorBlue", "CTRG TH4 -"],
["GrpCTRG_TH5", _hel, "TH5", "ColorGreen", "CTRG TH5 -"],
["GrpCTRG_TH6", _hel, "TH6", "ColorGreen", "CTRG TH6 -"],
["GrpCTRG_TH7", _hel, "TH7", "ColorOrange", "CTRG TH7 -"],
["GrpCTRG_TH8", _hel, "TH8", "ColorOrange", "CTRG TH8 -"],

["GrpCTRG_AH1", _hel, "AH1", "ColorRed", "CTRG AH1 -"],

["UnitCTRG_CO_M", _med, "COM", "ColorBlack", ""],
["UnitCTRG_DC_M", _med, "DCM", "ColorBlack", ""],
["UnitCTRG_ASL_M", _med, "AM", "ColorBlack", ""],
["UnitCTRG_BSL_M", _med, "BM", "ColorBlack", ""],
["UnitCTRG_CSL_M", _med, "CM", "ColorBlack", ""]
];

f_var_groupData_opfor_csat = [
["GrpCSAT_CO", _hq, "CO", "ColorYellow", "CSAT CO -"],
["GrpCSAT_DC", _hq, "DC", "ColorYellow", "CSAT DC -"],
Expand Down Expand Up @@ -730,6 +792,7 @@ f_var_groupData_all = [];
f_var_groupData_all append f_var_groupData_blufor_nato;
f_var_groupData_all append f_var_groupData_blufor_fia;
f_var_groupData_all append f_var_groupData_blufor_gen;
f_var_groupData_all append f_var_groupData_blufor_ctrg;
f_var_groupData_all append f_var_groupData_opfor_csat;
f_var_groupData_all append f_var_groupData_opfor_fia;
f_var_groupData_all append f_var_groupData_opfor_spetsnaz;
Expand Down

0 comments on commit e53145d

Please sign in to comment.