Skip to content

Commit

Permalink
Merge branch 'main' into Kit-Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Zarenx
Zarenx authored Apr 7, 2024
2 parents 449ec2b + 9910ab3 commit b87c112
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 42 deletions.
4 changes: 2 additions & 2 deletions cScripts/functions/vehicle/fn_vehicle_addCosmeticSelection.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ private _textures = [
_vehicle setVariable [QEGVAR(Vehicle,Callsign), -4, true];
}
]],
["I_APC_Wheeled_03_cannon_F", "Toggle Camo Net", [
["cav_dragoon_base_F", "Toggle Camo Net", [
"",
{
private _camoNetMounted = _vehicle animationSourcePhase "showCamonetHull";
Expand All @@ -109,7 +109,7 @@ private _textures = [
};
}
]],
["I_APC_Wheeled_03_cannon_F", "Toggle Slats", [
["cav_dragoon_base_F", "Toggle Slats", [
"",
{
private _slatsAreAttached = _vehicle animationSourcePhase "showSLATHull";
Expand Down
2 changes: 1 addition & 1 deletion cScripts/functions/vehicle/fn_vehicle_addCosmetics.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ if (_vehicle iskindOf "rhsusf_fmtv_base") then {
};


if (_vehicle isKindOf "I_APC_Wheeled_03_cannon_F") then {
if (_vehicle isKindOf "cav_dragoon_base_F") then {
// Animate slat armor and camo nets
_vehicle animateSource ["showCamonetHull",0, true];
_vehicle animateSource ["showBags",0, true];
Expand Down
2 changes: 2 additions & 0 deletions cScripts/functions/vehicle/fn_vehicle_addDefaultLoadout.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ private _pylon = [];

if (count _pylon == 0) then {
WARNING_2("VehicleDefaultLoadout", "Vehicle %1 [%2] has no loadout setup.", _vehicle, typeOf _vehicle);
} else {
_vehicle setVariable ["ace_rearm_scriptedLoadout", true, true];
};

_vehicle setVariable [QEGVAR(VehicleFunc,DefaultPylon), true, true];
2 changes: 1 addition & 1 deletion cScripts/functions/vehicle/fn_vehicle_addFunctions.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,6 @@ if (_vehicle iskindOf "rhsusf_m1a1tank_base") then {
[_vehicle] call EFUNC(vehicle,addFlagAction);
};

if (_vehicle iskindOf "I_APC_Wheeled_03_cannon_F") then {
if (_vehicle iskindOf "cav_dragoon_base_F") then {
[_vehicle] call EFUNC(vehicle,addFlagAction);
};
2 changes: 1 addition & 1 deletion cScripts/functions/vehicle/fn_vehicle_addFunctionsGlobal.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ if (_vehicle iskindOf "Truck_01_base_F") then {
};
};

if (_vehicle iskindOf "I_APC_Wheeled_03_cannon_F") then {
if (_vehicle iskindOf "cav_dragoon_base_F") then {
switch (_vehicleType) do {
case "MED": {_vehicle setVariable ["ace_medical_isMedicalVehicle", true, true];};
default {};
Expand Down
2 changes: 1 addition & 1 deletion cScripts/functions/vehicle/fn_vehicle_addInventory.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ if (_vehicleType == "EMPTY") exitWith { [_vehicle, []] call FUNC(addCargo); };


// Ground Vehicles
if (_vehicle iskindOf "I_APC_Wheeled_03_cannon_F") then {
if (_vehicle iskindOf "cav_dragoon_base_F") then {
[_vehicle, 15, 38, false, false] call FUNC(setCargoAttributes);

// Emergency kit in case of tire damage and fuel loss.
Expand Down
66 changes: 35 additions & 31 deletions cScripts/functions/vehicle/fn_vehicle_getPylon.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,52 +117,56 @@ private _rhsusf_m1a1tank_base = createHashMapFromArray [
];

// I_APC_Wheeled_03_cannon_F
private _I_APC_Wheeled_03_cannon_F = createHashMapFromArray [
// ["antiarmor", [
private _cav_dragoon_base_F = createHashMapFromArray [
["antiarmor", [
["SmokeLauncherMag",[0],6],
["2000Rnd_762x51_Belt_T_Red",[0],2000],
["2000Rnd_762x51_Belt_T_Red",[0],2000],
["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78],
["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78],
["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78],
["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78]
]],
// ["antiair", [
// ["SmokeLauncherMag",[0,0],6],
// ["2000Rnd_762x51_Belt_T_Red",[0],2000],
// ["2000Rnd_762x51_Belt_T_Red",[0],2000],
// ["140Rnd_30mm_MP_shells_Tracer_Red",[0],140],
// ["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60],
// ["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60],
// ["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60],

// ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
// ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
// ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78],
// ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78],
// ["4Rnd_Titan_long_missiles",[0],4]
// ]],
[ "antiair", [
["SmokeLauncherMag",[0,0],6],
["default",[
["SmokeLauncherMag",[0],6],
["2000Rnd_762x51_Belt_T_Red",[0],2000],
["2000Rnd_762x51_Belt_T_Red",[0],2000],
["140Rnd_30mm_MP_shells_Tracer_Red",[0],140],
["140Rnd_30mm_MP_shells_Tracer_Red",[0],140],
["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60],
["4Rnd_Titan_long_missiles",[0],4]
["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78],
["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78]
]],
["default",[
["SmokeLauncherMag",[0,0],6],
["balanced",[
["SmokeLauncherMag",[0],6],
["2000Rnd_762x51_Belt_T_Red",[0],2000],
["2000Rnd_762x51_Belt_T_Red",[0],2000],
["140Rnd_30mm_MP_shells_Tracer_Red",[0],140],
["140Rnd_30mm_MP_shells_Tracer_Red",[0],140],
["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60],
["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60],
["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60],
["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60]
["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78],
["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78],
["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78],
["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78]
]]
// ["assault",[
// ["SmokeLauncherMag",[0,0],6],
// ["2000Rnd_762x51_Belt_T_Red",[0],2000],
// ["2000Rnd_762x51_Belt_T_Red",[0],2000],
// ["140Rnd_30mm_MP_shells_Tracer_Red",[0],140],
// ["140Rnd_30mm_MP_shells_Tracer_Red",[0],140],
// ["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60],
// ["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60]
// ]]
];

// Loadout vehicle list
private _allVehiclePylons = createHashMapFromArray [
["rhsusf_m1a1tank_base", _rhsusf_m1a1tank_base],
["I_APC_Wheeled_03_cannon_F", _I_APC_Wheeled_03_cannon_F]
["cav_dragoon_base_F", _cav_dragoon_base_F]
];

// Return keys or full hashmap
Expand Down
10 changes: 5 additions & 5 deletions cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ if (_vehicle iskindOf "rhsusf_m1a1tank_base") then {
};


if (_vehicle iskindOf "I_APC_Wheeled_03_cannon_F" && !(_vehicle isKindOf "cav_dragoon_unarmed_base_F")) then {
if (_vehicle iskindOf "cav_dragoon_base_F" && !(_vehicle isKindOf "cav_dragoon_unarmed_base_F")) then {
_pylonList = [
// TypeOf, DisplayName, Name, Icon
// ["I_APC_Wheeled_03_cannon_F", "Anti-Armor", "antiarmor", ""],
["I_APC_Wheeled_03_cannon_F", "Anti-Air", "antiair", ""],
// ["I_APC_Wheeled_03_cannon_F", "Assault", "assault", ""],
["I_APC_Wheeled_03_cannon_F", "Default", "default", ""]
["cav_dragoon_base_F", "Anti-Personnel (default)", "default", ""],
["cav_dragoon_base_F", "Balanced", "balanced", ""],
["cav_dragoon_base_F", "Anti-Armor", "antiarmor", ""]
// ["I_APC_Wheeled_03_cannon_F", "Anti-Air", "antiair", ""]
];
};

Expand Down

0 comments on commit b87c112

Please sign in to comment.