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

Updated magazines for Charlie HMMWVs #1198

Merged
merged 9 commits into from
Aug 19, 2024
Merged

Updated magazines for Charlie HMMWVs #1198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6a0c758
Updated
pool011 May 14, 2024
4f5ffe6
Merge branch 'main' of https://github.com/7Cav/cScripts
pool011 May 14, 2024
fc3935c
Merge branch 'main' of https://github.com/7Cav/cScripts
pool011 May 19, 2024
f2c9a2e
Updated magazines for HMMWVs
pool011 Jun 3, 2024
43715c4
Rooikat 120 added
pool011 Jun 7, 2024
52b2a99
Merge branch 'main' into Updated-magazines-for-Charlie-HMMWVs
AndreasBrostrom Jun 28, 2024
e17a6c6
Merge branch 'main' into Updated-magazines-for-Charlie-HMMWVs
AndreasBrostrom Jul 9, 2024
8dce2cf
Update cScripts/cScripts_pylons.sqf
AndreasBrostrom Aug 19, 2024
763c7e2
Merge branch 'main' into Updated-magazines-for-Charlie-HMMWVs
AndreasBrostrom Aug 19, 2024
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
35 changes: 35 additions & 0 deletions cScripts/cScripts_logistics.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,6 +861,41 @@
["ACE_quikclot",20],
["ACE_packingBandage",20]
]],
["vehicle_rooikat", [
// Ammo
["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red", 16], // M856A1 PMAGs

// Grenades
["HandGrenade",6],
["SmokeShell",6],
["SmokeShellBlue",2],
["SmokeShellPurple",1],
["SmokeShellRed",2],

// Chemlights
["ACE_Chemlight_HiBlue",2],
["ACE_Chemlight_HiRed",2],
["ACE_Chemlight_IR",4],

// Explosives
["SatchelCharge_Remote_Mag",1],
["ACE_M26_Clacker",1],

// Tools
["ACE_EntrenchingTool",3],
["ACE_wirecutter",1],

// Medical
["kat_AED",1],
["ACE_epinephrine",4],
["ACE_splint",4],
["kat_naloxone",2],
["ACE_tourniquet",8],
["kat_guedel",4],
["kat_chestSeal",6],
["kat_Painkiller",3],
["ACE_packingBandage",40]
]],

// // // // // // // //
// Charlie Vehicles \\
Expand Down
255 changes: 255 additions & 0 deletions cScripts/cScripts_pylons.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,5 +176,260 @@
["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78]
]]
]]
]],
["rhsusf_M1165A1_GMV_SAG2_M2_M240_base", [
["default",[
["displayName", "Default"],
["icon", ""],
["loadout",[
["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0],100],
["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0],100],
["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0],100],
["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0],100],
["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0],100],
["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0],100],
["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0],100],
["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0],100],
["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0],100],
["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0],100],
["rhs_mag_100rnd_127x99_mag_Tracer_Red",[0],100],
["rhs_mag_762x51_M240_200",[2],200],
["rhs_mag_762x51_M240_200",[2],200],
["rhs_mag_762x51_M240_200",[2],200],
["rhs_mag_762x51_M240_200",[2],200],
["rhs_mag_762x51_M240_200",[2],200],
["rhs_mag_762x51_M240_200",[2],200],
["rhs_mag_762x51_M240_200",[2],200],
["rhs_mag_762x51_M240_200",[2],200],
["rhs_mag_762x51_M240_200",[2],200],
["rhs_mag_762x51_M240_200",[2],200],
["rhs_mag_762x51_M240_200",[2],200],
["rhs_mag_762x51_M240_200",[3],200],
["rhs_mag_762x51_M240_200",[3],200],
["rhs_mag_762x51_M240_200",[3],200],
["rhs_mag_762x51_M240_200",[3],200],
["rhs_mag_762x51_M240_200",[3],200],
["rhs_mag_762x51_M240_200",[3],200],
["rhs_mag_762x51_M240_200",[3],200],
["rhs_mag_762x51_M240_200",[3],200],
["rhs_mag_762x51_M240_200",[3],200],
["rhs_mag_762x51_M240_200",[3],200],
["rhs_mag_762x51_M240_200",[3],200]
]]
]]
]],
["rhsusf_M1165A1_GMV_SAG2_Mk19_M240_base", [
["default",[
["displayName", "Default"],
["icon", ""],
["loadout",[
["RHS_48Rnd_40mm_MK19_M430A1",[0],48],
["RHS_48Rnd_40mm_MK19_M430A1",[0],48],
["RHS_48Rnd_40mm_MK19_M430A1",[0],48],
["RHS_48Rnd_40mm_MK19_M430A1",[0],48],
["RHS_48Rnd_40mm_MK19_M430A1",[0],48],
["RHS_48Rnd_40mm_MK19_M430A1",[0],48],
["RHS_48Rnd_40mm_MK19_M430A1",[0],48],
["RHS_48Rnd_40mm_MK19_M430A1",[0],48],
["RHS_48Rnd_40mm_MK19_M430A1",[0],48],
["RHS_48Rnd_40mm_MK19_M430A1",[0],48],
["RHS_48Rnd_40mm_MK19_M430A1",[0],48],
["RHS_48Rnd_40mm_MK19_M430A1",[0],48],
["RHS_48Rnd_40mm_MK19_M430A1",[0],48],
["RHS_48Rnd_40mm_MK19_M430A1",[0],48],
["RHS_48Rnd_40mm_MK19_M430A1",[0],48],
["RHS_48Rnd_40mm_MK19_M430A1",[0],48],
["rhs_mag_762x51_M240_200",[2],200],
["rhs_mag_762x51_M240_200",[2],200],
["rhs_mag_762x51_M240_200",[2],200],
["rhs_mag_762x51_M240_200",[2],200],
["rhs_mag_762x51_M240_200",[2],200],
["rhs_mag_762x51_M240_200",[2],200],
["rhs_mag_762x51_M240_200",[2],200],
["rhs_mag_762x51_M240_200",[2],200],
["rhs_mag_762x51_M240_200",[2],200],
["rhs_mag_762x51_M240_200",[2],200],
["rhs_mag_762x51_M240_200",[2],200],
["rhs_mag_762x51_M240_200",[3],200],
["rhs_mag_762x51_M240_200",[3],200],
["rhs_mag_762x51_M240_200",[3],200],
["rhs_mag_762x51_M240_200",[3],200],
["rhs_mag_762x51_M240_200",[3],200],
["rhs_mag_762x51_M240_200",[3],200],
["rhs_mag_762x51_M240_200",[3],200],
["rhs_mag_762x51_M240_200",[3],200],
["rhs_mag_762x51_M240_200",[3],200],
["rhs_mag_762x51_M240_200",[3],200],
["rhs_mag_762x51_M240_200",[3],200]
]]
]]
]],
["B_AFV_Wheeled_01_up_cannon_F", [
["default",[
["displayName", "Heavy HEATFS-T"],
["icon", ""],
["loadout",[
["8Rnd_120mm_HEAT_MP_T_Red",[0],8],
["8Rnd_120mm_HEAT_MP_T_Red",[0],8],
["12Rnd_120mm_APFSDS_shells_Tracer_Red",[0],8],
AndreasBrostrom marked this conversation as resolved.
Show resolved Hide resolved
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["SmokeLauncherMag",[0,0],6],
["200Rnd_127x99_mag_Tracer_Red",[0,0],200],
["200Rnd_127x99_mag_Tracer_Red",[0,0],200]
]]
]],
["balanced",[
["displayName", "Balanced"],
["icon", ""],
["loadout",[
["12Rnd_120mm_HEAT_MP_T_Red",[0],12],
["12Rnd_120mm_APFSDS_shells_Tracer_Red",[0],12],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["SmokeLauncherMag",[0,0],6],
["200Rnd_127x99_mag_Tracer_Red",[0,0],200],
["200Rnd_127x99_mag_Tracer_Red",[0,0],200]
]]
]],
["antiarmor",[
["displayName", "Heavy APFSDS-T"],
["icon", ""],
["loadout",[
["8Rnd_120mm_HEAT_MP_T_Red",[0],8],
["20Rnd_120mm_APFSDS_shells_Tracer_Red",[0],16],
AndreasBrostrom marked this conversation as resolved.
Show resolved Hide resolved
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["SmokeLauncherMag",[0,0],6],
["200Rnd_127x99_mag_Tracer_Red",[0,0],200],
["200Rnd_127x99_mag_Tracer_Red",[0,0],200]
]]
]]
]],
["B_AFV_Wheeled_01_cannon_F", [
["default",[
["displayName", "Heavy HEATFS-T"],
["icon", ""],
["loadout",[
["8Rnd_120mm_HEAT_MP_T_Red",[0],8],
["8Rnd_120mm_HEAT_MP_T_Red",[0],8],
["12Rnd_120mm_APFSDS_shells_Tracer_Red",[0],8],
AndreasBrostrom marked this conversation as resolved.
Show resolved Hide resolved
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["SmokeLauncherMag",[0,0],6]
]]
]],
["balanced",[
["displayName", "Balanced"],
["icon", ""],
["loadout",[
["12Rnd_120mm_HEAT_MP_T_Red",[0],12],
["12Rnd_120mm_APFSDS_shells_Tracer_Red",[0],12],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["SmokeLauncherMag",[0,0],6]
]]
]],
["antiarmor",[
["displayName", "Heavy APFSDS-T"],
["icon", ""],
["loadout",[
["8Rnd_120mm_HEAT_MP_T_Red",[0],8],
["20Rnd_120mm_APFSDS_shells_Tracer_Red",[0],16],
AndreasBrostrom marked this conversation as resolved.
Show resolved Hide resolved
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["200Rnd_762x51_Belt_T_Red",[0],200],
["SmokeLauncherMag",[0,0],6]
]]
]]
]]
];
76 changes: 76 additions & 0 deletions cScripts/functions/vehicle/fn_vehicle_addCosmeticSelection.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,82 @@ private _textures = [
_vehicle animateSource ["showSLATHull",1, true];
};
}
]],
["AFV_Wheeled_01_base_F", "Toggle Camo Net", [
"",
{
private _camoNetMounted = _vehicle animationSourcePhase "showCamonetHull";
if (_camoNetMounted == 1) then {
_vehicle animateSource ["showCamonetTurret",0, true];
_vehicle animateSource ["showCamonetHull",0, true];
} else {
_vehicle animateSource ["showCamonetTurret",1, true];
_vehicle animateSource ["showCamonetHull",1, true];
};
}
]],
["AFV_Wheeled_01_base_F", "Toggle Slats", [
"",
{
private _slatsAreAttached = _vehicle animationSourcePhase "showSLATHull";
if (_slatsAreAttached == 1) then {
_vehicle animateSource ["showSLATHull",0, true];
} else {
_vehicle animateSource ["showSLATHull",1, true];
};
}
]],
["B_AFV_Wheeled_01_up_cannon_F", "Woodland Paint", [
"",
{
[_vehicle,[
[0, "a3\armor_f_tank\afv_wheeled_01\data\afv_wheeled_01_ext1_green_co.paa"],
[1, "a3\armor_f_tank\afv_wheeled_01\data\afv_wheeled_01_ext2_green_co.paa"],
[2, "a3\armor_f_tank\afv_wheeled_01\data\afv_wheeled_01_wheel_green_co.paa"],
[3, "a3\armor_f_tank\afv_wheeled_01\data\afv_wheeled_01_ext3_co.paa"],
[4, "a3\armor_f_tank\afv_wheeled_01\data\afv_commander_tow_co.paa"],
[5, "a3\armor_f\data\camonet_nato_green_co.paa"],
[6, "a3\armor_f_tank\afv_wheeled_01\data\afv_wheeled_01_ext3_co.paa"]
]] call EFUNC(vehicle,applyTextures);
}
]],
["B_AFV_Wheeled_01_up_cannon_F", "Desert Paint", [
"",
{
[_vehicle, [
[0, "a3\armor_f_tank\afv_wheeled_01\data\afv_wheeled_01_ext1_co.paa"],
[1, "a3\armor_f_tank\afv_wheeled_01\data\afv_wheeled_01_ext2_co.paa"],
[2, "a3\armor_f_tank\afv_wheeled_01\data\afv_wheeled_01_wheel_co.paa"],
[3, "a3\armor_f_tank\afv_wheeled_01\data\afv_wheeled_01_ext3_sand_co.paa"],
[4, "a3\armor_f_tank\afv_wheeled_01\data\afv_commander_tow_sand_co.paa"],
[5, "a3\armor_f\data\camonet_nato_desert_co.paa"],
[6, "a3\armor_f_tank\afv_wheeled_01\data\afv_wheeled_01_ext3_sand_co.paa"]
]] call EFUNC(vehicle,applyTextures);
}
]],
["B_AFV_Wheeled_01_cannon_F", "Woodland Paint", [
"",
{
[_vehicle,[
[0, "a3\armor_f_tank\afv_wheeled_01\data\afv_wheeled_01_ext1_green_co.paa"],
[1, "a3\armor_f_tank\afv_wheeled_01\data\afv_wheeled_01_ext2_green_co.paa"],
[2, "a3\armor_f_tank\afv_wheeled_01\data\afv_wheeled_01_wheel_green_co.paa"],
[3, "a3\armor_f\data\camonet_nato_green_co.paa"],
[4, "a3\armor_f_tank\afv_wheeled_01\data\afv_wheeled_01_ext3_co.paa"]
]] call EFUNC(vehicle,applyTextures);
}
]],
["B_AFV_Wheeled_01_cannon_F", "Desert Paint", [
"",
{
[_vehicle,[
[0, "a3\armor_f_tank\afv_wheeled_01\data\afv_wheeled_01_ext1_co.paa"],
[1, "a3\armor_f_tank\afv_wheeled_01\data\afv_wheeled_01_ext2_co.paa"],
[2, "a3\armor_f_tank\afv_wheeled_01\data\afv_wheeled_01_wheel_co.paa"],
[3, "a3\armor_f\data\camonet_nato_desert_co.paa"],
[4, "a3\armor_f_tank\afv_wheeled_01\data\afv_wheeled_01_ext3_sand_co.paa"]
]] call EFUNC(vehicle,applyTextures);
}
]]
];

Expand Down
Loading