From a8756c85e2b543d1c54cfa1ead3a97242c896a6a Mon Sep 17 00:00:00 2001 From: Maxime Cloutier Date: Sun, 31 Mar 2024 14:56:27 -0400 Subject: [PATCH 1/3] Fix: removed radios from vic loadouts --- vehicles/cgqc_heli_heavy.sqf | 12 +----------- vehicles/cgqc_heli_light.sqf | 12 +----------- vehicles/cgqc_heli_medium.sqf | 12 +----------- vehicles/cgqc_vic_loadout_command.cpp | 9 ++------- vehicles/cgqc_vic_loadout_ifv.cpp | 9 ++------- vehicles/cgqc_vic_loadout_medium.cpp | 10 ---------- vehicles/cgqc_vic_loadout_quadExt.cpp | 10 ---------- vehicles/cgqc_vic_loadout_quadExt_mk6.cpp | 10 ---------- vehicles/cgqc_vic_loadout_small.cpp | 11 +---------- vehicles/cgqc_vic_loadout_sub.cpp | 11 +---------- 10 files changed, 9 insertions(+), 97 deletions(-) diff --git a/vehicles/cgqc_heli_heavy.sqf b/vehicles/cgqc_heli_heavy.sqf index cd75f79..e49cd5a 100644 --- a/vehicles/cgqc_heli_heavy.sqf +++ b/vehicles/cgqc_heli_heavy.sqf @@ -16,7 +16,7 @@ class TransportMagazines }; class TransportItems { - + // Ammo ----------------------------------- class _xx_cgqc_bandolier_ammo { @@ -42,16 +42,6 @@ class TransportItems count = 5; name = "ACE_EarPlugs"; }; - class _xx_ACRE_PRC343 - { - count = 5; - name = "ACRE_PRC343"; - }; - class _xx_ACRE_PRC152 - { - count = 5; - name = "ACRE_PRC152"; - }; class _xx_ACE_EntrenchingTool { count = 5; diff --git a/vehicles/cgqc_heli_light.sqf b/vehicles/cgqc_heli_light.sqf index 526b725..4ab65bb 100644 --- a/vehicles/cgqc_heli_light.sqf +++ b/vehicles/cgqc_heli_light.sqf @@ -15,7 +15,7 @@ class TransportMagazines }; class TransportItems { - + // Ammo ----------------------------------- class _xx_cgqc_bandolier_ammo { @@ -46,16 +46,6 @@ class TransportItems count = 2; name = "ACE_EarPlugs"; }; - class _xx_ACRE_PRC343 - { - count = 1; - name = "ACRE_PRC343"; - }; - class _xx_ACRE_PRC152 - { - count = 1; - name = "ACRE_PRC152"; - }; class _xx_ACE_EntrenchingTool { count = 1; diff --git a/vehicles/cgqc_heli_medium.sqf b/vehicles/cgqc_heli_medium.sqf index 2c7a61c..7ff281f 100644 --- a/vehicles/cgqc_heli_medium.sqf +++ b/vehicles/cgqc_heli_medium.sqf @@ -1,4 +1,4 @@ -// Medium helicopter loadout +// Medium helicopter loadout class TransportMagazines { @@ -46,16 +46,6 @@ class TransportItems count = 2; name = "ACE_EarPlugs"; }; - class _xx_ACRE_PRC343 - { - count = 2; - name = "ACRE_PRC343"; - }; - class _xx_ACRE_PRC152 - { - count = 2; - name = "ACRE_PRC152"; - }; class _xx_ACE_EntrenchingTool { count = 2; diff --git a/vehicles/cgqc_vic_loadout_command.cpp b/vehicles/cgqc_vic_loadout_command.cpp index f1a1282..3a7546d 100644 --- a/vehicles/cgqc_vic_loadout_command.cpp +++ b/vehicles/cgqc_vic_loadout_command.cpp @@ -1,5 +1,5 @@ class TransportMagazines{ - + }; class TransportWeapons{ @@ -29,11 +29,6 @@ class TransportItems{ count = 5; name = "cgqc_items_ifak"; }; - class _xx_ACRE_PRC152 - { - count = 2; - name = "ACRE_PRC152"; - }; class _xx_Toolkit { name = "Toolkit"; @@ -44,7 +39,7 @@ class TransportItems{ count = 2; name = "ACE_UAVBattery"; }; - + class _xx_ACE_bodyBag { count = 2; diff --git a/vehicles/cgqc_vic_loadout_ifv.cpp b/vehicles/cgqc_vic_loadout_ifv.cpp index 36ebbc8..28aa372 100644 --- a/vehicles/cgqc_vic_loadout_ifv.cpp +++ b/vehicles/cgqc_vic_loadout_ifv.cpp @@ -1,7 +1,7 @@ class TransportBackpacks{}; class TransportMagazines{ - + class _xx_rhsusf_m112_mag { count = 4; @@ -20,7 +20,7 @@ class TransportMagazines{ }; class TransportWeapons{ - + class _xx_launch_NLAW_F { weapon = "launch_NLAW_F"; @@ -52,11 +52,6 @@ class TransportItems{ count = 12; name = "cgqc_items_ifak"; }; - class _xx_ACRE_PRC152 - { - count = 2; - name = "ACRE_PRC152"; - }; class _xx_Toolkit { name = "Toolkit"; diff --git a/vehicles/cgqc_vic_loadout_medium.cpp b/vehicles/cgqc_vic_loadout_medium.cpp index 369b6e8..3bf1631 100644 --- a/vehicles/cgqc_vic_loadout_medium.cpp +++ b/vehicles/cgqc_vic_loadout_medium.cpp @@ -22,16 +22,6 @@ class TransportItems{ count = 5; name = "ACE_bodyBag"; }; - class _xx_ACRE_PRC152 - { - count = 1; - name = "ACRE_PRC152"; - }; - class _xx_ACRE_PRC343 - { - count = 1; - name = "ACRE_PRC343"; - }; }; class TransportWeapons{ class _xx_launch_NLAW_F diff --git a/vehicles/cgqc_vic_loadout_quadExt.cpp b/vehicles/cgqc_vic_loadout_quadExt.cpp index 73134d0..c655d5c 100644 --- a/vehicles/cgqc_vic_loadout_quadExt.cpp +++ b/vehicles/cgqc_vic_loadout_quadExt.cpp @@ -28,16 +28,6 @@ class TransportItems count = 1; name = "ACE_bodyBag"; }; - class _xx_ACRE_PRC152 - { - count = 1; - name = "ACRE_PRC152"; - }; - class _xx_ACRE_PRC343 - { - count = 1; - name = "ACRE_PRC343"; - }; }; class TransportBackpacks{}; class TransportMagazines diff --git a/vehicles/cgqc_vic_loadout_quadExt_mk6.cpp b/vehicles/cgqc_vic_loadout_quadExt_mk6.cpp index 300555d..ea87cf0 100644 --- a/vehicles/cgqc_vic_loadout_quadExt_mk6.cpp +++ b/vehicles/cgqc_vic_loadout_quadExt_mk6.cpp @@ -28,16 +28,6 @@ class TransportItems count = 1; name = "ACE_bodyBag"; }; - class _xx_ACRE_PRC152 - { - count = 1; - name = "ACRE_PRC152"; - }; - class _xx_ACRE_PRC343 - { - count = 1; - name = "ACRE_PRC343"; - }; class _xx_ACE_artilleryTable { count = 2; diff --git a/vehicles/cgqc_vic_loadout_small.cpp b/vehicles/cgqc_vic_loadout_small.cpp index 59ae9a2..e81334c 100644 --- a/vehicles/cgqc_vic_loadout_small.cpp +++ b/vehicles/cgqc_vic_loadout_small.cpp @@ -16,16 +16,7 @@ class TransportItems{ count = 1; name = "ACE_bodyBag"; }; - class _xx_ACRE_PRC152 - { - count = 1; - name = "ACRE_PRC152"; - }; - class _xx_ACRE_PRC343 - { - count = 1; - name = "ACRE_PRC343"; - }; + }; class TransportWeapons{ class _xx_launch_NLAW_F diff --git a/vehicles/cgqc_vic_loadout_sub.cpp b/vehicles/cgqc_vic_loadout_sub.cpp index d88d23d..2bb6ef4 100644 --- a/vehicles/cgqc_vic_loadout_sub.cpp +++ b/vehicles/cgqc_vic_loadout_sub.cpp @@ -38,16 +38,7 @@ class TransportItems count = 1; name = "ACE_bodyBag"; }; - class _xx_ACRE_PRC152 - { - count = 1; - name = "ACRE_PRC152"; - }; - class _xx_ACRE_PRC343 - { - count = 1; - name = "ACRE_PRC343"; - }; + }; class TransportBackpacks{}; class TransportMagazines From 8c4eb6e66aca7f81e4e08cc39fc34a1519ca31ac Mon Sep 17 00:00:00 2001 From: Maxime Cloutier Date: Sun, 31 Mar 2024 20:34:26 -0400 Subject: [PATCH 2/3] Version --- factions/init_player.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/factions/init_player.sqf b/factions/init_player.sqf index ac90d35..2b04830 100644 --- a/factions/init_player.sqf +++ b/factions/init_player.sqf @@ -2,7 +2,7 @@ // Wait until Core is finished initializing. //waitUntil {sleep 1;cgqc_player_rank_found}; - _version = "3.2"; + _version = "3.2.1"; // Client-side code player setVariable ["cgqc_version_2023", _version, true]; // Set the client's mod version }; \ No newline at end of file From f5a1337f17c607b720653fa36d286632ad3f0ac4 Mon Sep 17 00:00:00 2001 From: Maxime Cloutier Date: Tue, 2 Apr 2024 15:50:44 -0400 Subject: [PATCH 3/3] Ajout: XO --- cfg_units_mk1.cpp | 21 +++++++++++++++++++++ factions/init_player.sqf | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/cfg_units_mk1.cpp b/cfg_units_mk1.cpp index 90ead6c..68c01b2 100644 --- a/cfg_units_mk1.cpp +++ b/cfg_units_mk1.cpp @@ -40,6 +40,27 @@ class CGQC_units_mk1_0_SL : cgqc_soldat_moderne backpack = "CGQC_units_mk1_0_HQ_pack"; editorPreview = "\CGQC_2022\pics\CGQC_units_mk1_0_HQ.jpg"; }; +class CGQC_units_mk1_0_XO : cgqc_soldat_moderne +{ + faction = "CGQC"; + editorSubcategory = "EdSubcat_cgqc_mk1"; + side = 1; + scope = 2; + scopeCurator = 2; + displayName = "Executive Officer"; + uniformClass = "cgqc_uniform_mk1"; + weapons[] = {"cgqc_gun_mk1_hq_m4a1", "cgqc_gun_glock19_wood", "Laserdesignator_01_khk_F", "Put", "Throw"}; + respawnWeapons[] = {"cgqc_gun_mk1_hq_m4a1", "cgqc_gun_glock19_wood", "Laserdesignator_01_khk_F", "Put", "Throw"}; + items[] = {}; + respawnItems[] = {}; + magazines[] = {}; + respawnMagazines[] = {}; + linkedItems[] = {"ItemMap", "ItemCompass", "ItemWatch", "B_UavTerminal", "JAS_GPNVG18_blk", "Laserdesignator_01_khk_F", "cgqc_helmet_mk1", "cgqc_vest_mk1_tan", "G_mas_can_shemag_gog_l"}; + respawnLinkedItems[] = {"ItemMap", "ItemCompass", "ItemWatch", "B_UavTerminal", "JAS_GPNVG18_blk", "Laserdesignator_01_khk_F", "cgqc_helmet_mk1", "cgqc_vest_mk1_tan", "G_mas_can_shemag_gog_l"}; + backpack = "CGQC_units_mk1_0_HQ_pack"; + editorPreview = "\CGQC_2022\pics\CGQC_units_mk1_0_HQ.jpg"; +}; + class CGQC_units_mk1_0_TeamLeader_Carbine : cgqc_soldat_moderne { faction = "CGQC"; diff --git a/factions/init_player.sqf b/factions/init_player.sqf index 2b04830..01127ba 100644 --- a/factions/init_player.sqf +++ b/factions/init_player.sqf @@ -2,7 +2,7 @@ // Wait until Core is finished initializing. //waitUntil {sleep 1;cgqc_player_rank_found}; - _version = "3.2.1"; + _version = "3.2.1.1"; // Client-side code player setVariable ["cgqc_version_2023", _version, true]; // Set the client's mod version }; \ No newline at end of file