Skip to content

Commit

Permalink
Merge pull request #397 from maxcloutier13/Dev---Active
Browse files Browse the repository at this point in the history 
Ajout: New roles
  • Loading branch information
@maxcloutier13
maxcloutier13 authored Mar 15, 2024
2 parents e758290 + 6302563 commit a14b40b
Show file tree
Hide file tree
Showing 3 changed files with 141 additions and 24 deletions.
133 changes: 111 additions & 22 deletions cfg_units_mk1.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,72 @@ class CGQC_units_mk1_1_Rifleman_grenadier : cgqc_soldat_moderne
backpack = "CGQC_units_mk1_1_Rifleman_Carbine_pack";
editorPreview = "\CGQC_2022\pics\CGQC_units_mk1_1_Rifleman_Carbine.jpg";
};
// Junior specialists
class CGQC_units_mk1_2_Marksman : cgqc_soldat_moderne
{
faction = "CGQC";
editorSubcategory = "EdSubcat_cgqc_mk1";
side = 1;
scope = 2;
scopeCurator = 2;
displayName = "Combat Sharpshooter";
uniformClass = "cgqc_uniform_mk1";
weapons[] = {"cgqc_gun_mk1_hk417", "cgqc_gun_glock19_wood", "ACE_Vector", "Put", "Throw"};
respawnWeapons[] = {"cgqc_gun_mk1_hk417", "cgqc_gun_glock19_wood", "ACE_Vector", "Put", "Throw"};
items[] = {};
respawnItems[] = {};
magazines[] = {};
respawnMagazines[] = {};
linkedItems[] = {"ItemMap", "ItemCompass", "ItemWatch", "B_UavTerminal", "JAS_GPNVG18_blk", "ACE_Vector", "cgqc_helmet_mk1", "cgqc_vest_mk1_tan_lr", "G_mas_can_balaM_T"};
respawnLinkedItems[] = {"ItemMap", "ItemCompass", "ItemWatch", "B_UavTerminal", "JAS_GPNVG18_blk", "ACE_Vector", "cgqc_helmet_mk1", "cgqc_vest_mk1_tan_lr", "G_mas_can_balaM_T"};
backpack = "CGQC_units_mk1_2_Marksman_pack";
editorPreview = "\CGQC_2022\pics\CGQC_units_mk1_2_Marksman.jpg";
};

class CGQC_units_mk1_2_repair : cgqc_soldat_moderne
{
faction = "CGQC";
editorSubcategory = "EdSubcat_cgqc_mk1";
side = 1;
scope = 2;
scopeCurator = 2;
displayName = "Combat Engineer";
uniformClass = "cgqc_uniform_mk1";
weapons[] = {"cgqc_gun_mk1_hk417", "cgqc_gun_glock19_wood", "ACE_Vector", "Put", "Throw"};
respawnWeapons[] = {"cgqc_gun_mk1_hk417", "cgqc_gun_glock19_wood", "ACE_Vector", "Put", "Throw"};
items[] = {};
respawnItems[] = {};
magazines[] = {};
respawnMagazines[] = {};
linkedItems[] = {"ItemMap", "ItemCompass", "ItemWatch", "B_UavTerminal", "JAS_GPNVG18_blk", "ACE_Vector", "cgqc_helmet_mk1", "cgqc_vest_mk1_tan_lr", "G_mas_can_balaM_T"};
respawnLinkedItems[] = {"ItemMap", "ItemCompass", "ItemWatch", "B_UavTerminal", "JAS_GPNVG18_blk", "ACE_Vector", "cgqc_helmet_mk1", "cgqc_vest_mk1_tan_lr", "G_mas_can_balaM_T"};
backpack = "CGQC_units_mk1_2_Marksman_pack";
editorPreview = "\CGQC_2022\pics\CGQC_units_mk1_2_Marksman.jpg";
};

class CGQC_units_mk1_2_lifesaver : cgqc_soldat_moderne
{
faction = "CGQC";
editorSubcategory = "EdSubcat_cgqc_mk1";
side = 1;
scope = 2;
scopeCurator = 2;
displayName = "Combat Lifesaver";
uniformClass = "cgqc_uniform_mk1";
weapons[] = {"cgqc_gun_mk1_hk417", "cgqc_gun_glock19_wood", "ACE_Vector", "Put", "Throw"};
respawnWeapons[] = {"cgqc_gun_mk1_hk417", "cgqc_gun_glock19_wood", "ACE_Vector", "Put", "Throw"};
items[] = {};
respawnItems[] = {};
magazines[] = {};
respawnMagazines[] = {};
linkedItems[] = {"ItemMap", "ItemCompass", "ItemWatch", "B_UavTerminal", "JAS_GPNVG18_blk", "ACE_Vector", "cgqc_helmet_mk1", "cgqc_vest_mk1_tan_lr", "G_mas_can_balaM_T"};
respawnLinkedItems[] = {"ItemMap", "ItemCompass", "ItemWatch", "B_UavTerminal", "JAS_GPNVG18_blk", "ACE_Vector", "cgqc_helmet_mk1", "cgqc_vest_mk1_tan_lr", "G_mas_can_balaM_T"};
backpack = "CGQC_units_mk1_2_Marksman_pack";
editorPreview = "\CGQC_2022\pics\CGQC_units_mk1_2_Marksman.jpg";
};



// == Infantry + ================================================================
class CGQC_units_mk1_3_AT_MAAWS : cgqc_soldat_moderne
{
Expand Down Expand Up @@ -230,7 +296,7 @@ class CGQC_units_mk1_2_LMG : cgqc_soldat_moderne
side = 1;
scope = 2;
scopeCurator = 2;
displayName = "MG (Light)";
displayName = "MG (5.56)";
uniformClass = "cgqc_uniform_mk1";
weapons[] = {"cgqc_gun_mk1_mk46", "cgqc_gun_glock19_wood", "cgqc_item_rangefinder", "Put", "Throw"};
respawnWeapons[] = {"cgqc_gun_mk1_mk46", "cgqc_gun_glock19_wood", "cgqc_item_rangefinder", "Put", "Throw"};
Expand All @@ -250,7 +316,49 @@ class CGQC_units_mk1_2_HMG : cgqc_soldat_moderne
side = 1;
scope = 2;
scopeCurator = 2;
displayName = "MG (Heavy)";
displayName = "MG (7.62)";
uniformClass = "cgqc_uniform_mk1";
weapons[] = {"cgqc_gun_mk1_mk48", "cgqc_gun_glock19_wood", "cgqc_item_rangefinder", "Put", "Throw"};
respawnWeapons[] = {"cgqc_gun_mk1_mk48", "cgqc_gun_glock19_wood", "cgqc_item_rangefinder", "Put", "Throw"};
items[] = {};
respawnItems[] = {};
magazines[] = {};
respawnMagazines[] = {};
linkedItems[] = {"ItemMap", "ItemCompass", "ItemWatch", "ItemGPS", "JAS_GPNVG18_blk", "cgqc_item_rangefinder", "cgqc_helmet_mk1", "cgqc_vest_mk1_tan_ar", "G_mas_can_balaM_T"};
respawnLinkedItems[] = {"ItemMap", "ItemCompass", "ItemWatch", "ItemGPS", "JAS_GPNVG18_blk", "cgqc_item_rangefinder", "cgqc_helmet_mk1", "cgqc_vest_mk1_tan_ar", "G_mas_can_balaM_T"};
backpack = "CGQC_units_mk1_2_HMG_pack";
editorPreview = "\CGQC_2022\pics\CGQC_units_mk1_2_HMG.jpg";
};

class CGQC_units_mk1_2_autorifleman : cgqc_soldat_moderne
{
faction = "CGQC";
editorSubcategory = "EdSubcat_cgqc_mk1";
side = 1;
scope = 2;
scopeCurator = 2;
displayName = "Autorifleman (5.56)";
uniformClass = "cgqc_uniform_mk1";
weapons[] = {"cgqc_gun_mk1_mk48", "cgqc_gun_glock19_wood", "cgqc_item_rangefinder", "Put", "Throw"};
respawnWeapons[] = {"cgqc_gun_mk1_mk48", "cgqc_gun_glock19_wood", "cgqc_item_rangefinder", "Put", "Throw"};
items[] = {};
respawnItems[] = {};
magazines[] = {};
respawnMagazines[] = {};
linkedItems[] = {"ItemMap", "ItemCompass", "ItemWatch", "ItemGPS", "JAS_GPNVG18_blk", "cgqc_item_rangefinder", "cgqc_helmet_mk1", "cgqc_vest_mk1_tan_ar", "G_mas_can_balaM_T"};
respawnLinkedItems[] = {"ItemMap", "ItemCompass", "ItemWatch", "ItemGPS", "JAS_GPNVG18_blk", "cgqc_item_rangefinder", "cgqc_helmet_mk1", "cgqc_vest_mk1_tan_ar", "G_mas_can_balaM_T"};
backpack = "CGQC_units_mk1_2_HMG_pack";
editorPreview = "\CGQC_2022\pics\CGQC_units_mk1_2_HMG.jpg";
};

class CGQC_units_mk1_2_LWMMG : cgqc_soldat_moderne
{
faction = "CGQC";
editorSubcategory = "EdSubcat_cgqc_mk1";
side = 1;
scope = 2;
scopeCurator = 2;
displayName = "LWMMG (338)";
uniformClass = "cgqc_uniform_mk1";
weapons[] = {"cgqc_gun_mk1_mk48", "cgqc_gun_glock19_wood", "cgqc_item_rangefinder", "Put", "Throw"};
respawnWeapons[] = {"cgqc_gun_mk1_mk48", "cgqc_gun_glock19_wood", "cgqc_item_rangefinder", "Put", "Throw"};
Expand Down Expand Up @@ -308,26 +416,7 @@ class CGQC_units_mk1_1_Medic : cgqc_soldat_moderne
backpack = "CGQC_units_mk1_1_Medic_pack";
editorPreview = "\CGQC_2022\pics\CGQC_units_mk1_1_Medic.jpg";
};
class CGQC_units_mk1_2_Marksman : cgqc_soldat_moderne
{
faction = "CGQC";
editorSubcategory = "EdSubcat_cgqc_mk1";
side = 1;
scope = 2;
scopeCurator = 2;
displayName = "Marksman (417)";
uniformClass = "cgqc_uniform_mk1";
weapons[] = {"cgqc_gun_mk1_hk417", "cgqc_gun_glock19_wood", "ACE_Vector", "Put", "Throw"};
respawnWeapons[] = {"cgqc_gun_mk1_hk417", "cgqc_gun_glock19_wood", "ACE_Vector", "Put", "Throw"};
items[] = {};
respawnItems[] = {};
magazines[] = {};
respawnMagazines[] = {};
linkedItems[] = {"ItemMap", "ItemCompass", "ItemWatch", "B_UavTerminal", "JAS_GPNVG18_blk", "ACE_Vector", "cgqc_helmet_mk1", "cgqc_vest_mk1_tan_lr", "G_mas_can_balaM_T"};
respawnLinkedItems[] = {"ItemMap", "ItemCompass", "ItemWatch", "B_UavTerminal", "JAS_GPNVG18_blk", "ACE_Vector", "cgqc_helmet_mk1", "cgqc_vest_mk1_tan_lr", "G_mas_can_balaM_T"};
backpack = "CGQC_units_mk1_2_Marksman_pack";
editorPreview = "\CGQC_2022\pics\CGQC_units_mk1_2_Marksman.jpg";
};

// == Recon ================================================================
class CGQC_units_mk1_0_Drone_operator : cgqc_soldat_moderne
{
Expand Down
30 changes: 29 additions & 1 deletion cfg_vehicles.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ class Rev_darter_b: B_UAV_01_F
};
};

class cgqc_drone_darter_light : cgqc_drone_darter
class cgqc_drone_darter_light : cgqc_drone_darter
{
displayName = "CGQC - Darter Léger";
maxSpeed = 100;
Expand Down Expand Up @@ -516,6 +516,21 @@ class cgqc_vic_wiezel : I_LT_01_scout_F
//#include "vehicles\cgqc_vic_loadout_command"
#include "vehicles\cgqc_vic_loadout_command.cpp"
};

class rhsgref_BRDM2_HQ;
class cgqc_vic_brdm : rhsgref_BRDM2_HQ
{
scope = 2;
side = 1;
author = "silent1";
faction = "cgqc";
editorSubcategory = "EdSubcat_cgqc_cmd";
displayName = "Command BRDM (3+2+6)";
crew = "CGQC_units_mk2_Tank_Driver_ai";
//Custom inventory
#include "vehicles\cgqc_vic_loadout_command.cpp"
};

// Tanks -----------------------------------------------------------------------------------
class UK3CB_LDF_B_Leopard_Cage;
class cgqc_vic_tank_leopard : UK3CB_LDF_B_Leopard_Cage {
Expand Down Expand Up @@ -710,6 +725,19 @@ class cgqc_vic_polaris : rhsusf_mrzr4_d {
#include "vehicles\cgqc_vic_loadout_small.cpp"
};
// Armed -----------------------------------------------------------------------------------
class rhsusf_M1117_D;
class cgqc_vic_m1117 : rhsusf_M1117_D
{
scope = 2;
side = 1;
author = "silent1";
faction = "cgqc";
editorSubcategory = "EdSubcat_cgqc_vic_armed";
displayName = "M1117 HMG/Mk19 (3+4)";
crew = "CGQC_units_mk2_Tank_Driver_ai";
#include "vehicles\cgqc_vic_loadout_medium.cpp"
};

class cgqc_vic_jeep_hmg : UK3CB_B_M151_Jeep_HMG_HIDF {
scope = 2;
side = 1;
Expand Down
2 changes: 1 addition & 1 deletion factions/init_player.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Wait until Core is finished initializing.
//waitUntil {sleep 1;cgqc_player_rank_found};

_version = "3.1.4";
_version = "3.1.5";
// Client-side code
player setVariable ["cgqc_version_2023", _version, true]; // Set the client's mod version
};

0 comments on commit a14b40b

Please sign in to comment.