From a0d92a1c48b6a8b3aff05cbc8fc5af681dee4f58 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Fri, 2 Feb 2024 18:19:29 -0500 Subject: [PATCH 1/8] MP swapped for 78 rnd HEI --- .../functions/vehicle/fn_vehicle_getPylon.sqf | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf index 84a64f535..6834026be 100644 --- a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf @@ -132,21 +132,21 @@ private _I_APC_Wheeled_03_cannon_F = createHashMapFromArray [ ["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], + ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], ["4Rnd_Titan_long_missiles",[0],4] ]], ["default",[ ["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], - ["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60], - ["60Rnd_30mm_APFSDS_shells_Tracer_Red",[0],60] + ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78] ]] // ["assault",[ // ["SmokeLauncherMag",[0,0],6], From 7dd14335ca203a3ae2472d87e08726deab156912 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Fri, 2 Feb 2024 20:56:05 -0500 Subject: [PATCH 2/8] Updated Possible Loadouts --- .../functions/vehicle/fn_vehicle_getPylon.sqf | 44 ++++++++++--------- .../fn_vehicle_setupPylonCategories.sqf | 7 +-- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf index 6834026be..9a90eb417 100644 --- a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf @@ -118,23 +118,25 @@ private _rhsusf_m1a1tank_base = createHashMapFromArray [ // I_APC_Wheeled_03_cannon_F private _I_APC_Wheeled_03_cannon_F = createHashMapFromArray [ - // ["antiarmor", [ - // ["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], - - // ]], - [ "antiair", [ + ["antiarmor", [ ["SmokeLauncherMag",[0,0],6], ["2000Rnd_762x51_Belt_T_Red",[0],2000], ["2000Rnd_762x51_Belt_T_Red",[0],2000], ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], + ["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], + ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], ["4Rnd_Titan_long_missiles",[0],4] ]], ["default",[ @@ -143,20 +145,22 @@ private _I_APC_Wheeled_03_cannon_F = createHashMapFromArray [ ["2000Rnd_762x51_Belt_T_Red",[0],2000], ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78] + ]], + ["balanced",[ + ["SmokeLauncherMag",[0,0],6], + ["2000Rnd_762x51_Belt_T_Red",[0],2000], + ["2000Rnd_762x51_Belt_T_Red",[0],2000], + ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], + ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], ["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 diff --git a/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf b/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf index ad271d0bf..4b5c56e2d 100644 --- a/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf @@ -36,10 +36,11 @@ if (_vehicle iskindOf "rhsusf_m1a1tank_base") then { if (_vehicle iskindOf "I_APC_Wheeled_03_cannon_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-Personnel (default)", "default", ""], + ["I_APC_Wheeled_03_cannon_F", "Balanced", "balanced", ""], + ["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", ""] + ]; }; From 8a2d15e8b90f7d75a3f40aef452d2a3c4f0fb61d Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Fri, 2 Feb 2024 21:06:45 -0500 Subject: [PATCH 3/8] Extra comma removed --- cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf b/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf index 4b5c56e2d..a99b1b6c1 100644 --- a/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf @@ -39,7 +39,7 @@ if (_vehicle iskindOf "I_APC_Wheeled_03_cannon_F" && !(_vehicle isKindOf "cav_dr ["I_APC_Wheeled_03_cannon_F", "Anti-Personnel (default)", "default", ""], ["I_APC_Wheeled_03_cannon_F", "Balanced", "balanced", ""], ["I_APC_Wheeled_03_cannon_F", "Anti-Armor", "antiarmor", ""], - ["I_APC_Wheeled_03_cannon_F", "Anti-Air", "antiair", ""], + ["I_APC_Wheeled_03_cannon_F", "Anti-Air", "antiair", ""] ]; }; From 4387886ca993a9a02a8e6993dec785efa4e891e4 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Fri, 2 Feb 2024 21:07:08 -0500 Subject: [PATCH 4/8] Extra new line removed --- cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf | 1 - 1 file changed, 1 deletion(-) diff --git a/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf b/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf index a99b1b6c1..5b7982d66 100644 --- a/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf @@ -40,7 +40,6 @@ if (_vehicle iskindOf "I_APC_Wheeled_03_cannon_F" && !(_vehicle isKindOf "cav_dr ["I_APC_Wheeled_03_cannon_F", "Balanced", "balanced", ""], ["I_APC_Wheeled_03_cannon_F", "Anti-Armor", "antiarmor", ""], ["I_APC_Wheeled_03_cannon_F", "Anti-Air", "antiair", ""] - ]; }; From 99c445d6752a4022b98fa5cc533d3d552c0a532f Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Thu, 4 Apr 2024 15:37:05 -0400 Subject: [PATCH 5/8] Missiles removed --- .../functions/vehicle/fn_vehicle_getPylon.sqf | 58 ++++++++++--------- .../fn_vehicle_setupPylonCategories.sqf | 4 +- 2 files changed, 33 insertions(+), 29 deletions(-) diff --git a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf index 9a90eb417..2864cf174 100644 --- a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf @@ -120,46 +120,50 @@ private _rhsusf_m1a1tank_base = createHashMapFromArray [ private _I_APC_Wheeled_03_cannon_F = createHashMapFromArray [ ["antiarmor", [ ["SmokeLauncherMag",[0,0],6], - ["2000Rnd_762x51_Belt_T_Red",[0],2000], - ["2000Rnd_762x51_Belt_T_Red",[0],2000], - ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], - ["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], - ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], - ["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_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], + // ["SmokeLauncherMag",[0,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], + // ["4Rnd_Titan_long_missiles",[0],4] + // ]], ["default",[ + ["SmokeLauncherMag",[0,0],6], ["SmokeLauncherMag",[0,0],6], ["2000Rnd_762x51_Belt_T_Red",[0],2000], ["2000Rnd_762x51_Belt_T_Red",[0],2000], - ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_APFSDS_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_HEI_shells_Tracer_Red",[0],78], + ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], + ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78] ]], ["balanced",[ + ["SmokeLauncherMag",[0,0],6], ["SmokeLauncherMag",[0,0],6], ["2000Rnd_762x51_Belt_T_Red",[0],2000], ["2000Rnd_762x51_Belt_T_Red",[0],2000], - ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], - ["78Rnd_30mm_APFSDS_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], + ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78] ]] ]; diff --git a/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf b/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf index 5b7982d66..efdd19e41 100644 --- a/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf @@ -38,8 +38,8 @@ if (_vehicle iskindOf "I_APC_Wheeled_03_cannon_F" && !(_vehicle isKindOf "cav_dr // TypeOf, DisplayName, Name, Icon ["I_APC_Wheeled_03_cannon_F", "Anti-Personnel (default)", "default", ""], ["I_APC_Wheeled_03_cannon_F", "Balanced", "balanced", ""], - ["I_APC_Wheeled_03_cannon_F", "Anti-Armor", "antiarmor", ""], - ["I_APC_Wheeled_03_cannon_F", "Anti-Air", "antiair", ""] + ["I_APC_Wheeled_03_cannon_F", "Anti-Armor", "antiarmor", ""] + // ["I_APC_Wheeled_03_cannon_F", "Anti-Air", "antiair", ""] ]; }; From 8802bc81f3d9f8d67e5aebf310704aefe464e787 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Thu, 4 Apr 2024 17:39:15 -0400 Subject: [PATCH 6/8] Remove extra smoke launcher mag --- cScripts/functions/vehicle/fn_vehicle_getPylon.sqf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf index 2864cf174..bb72fc4bd 100644 --- a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf @@ -119,7 +119,6 @@ private _rhsusf_m1a1tank_base = createHashMapFromArray [ // I_APC_Wheeled_03_cannon_F private _I_APC_Wheeled_03_cannon_F = createHashMapFromArray [ ["antiarmor", [ - ["SmokeLauncherMag",[0,0],6], ["SmokeLauncherMag",[0,0],6], ["2000Rnd_762x51_Belt_T_Red",[0],2000], ["2000Rnd_762x51_Belt_T_Red",[0],2000], @@ -132,7 +131,6 @@ private _I_APC_Wheeled_03_cannon_F = createHashMapFromArray [ ]], // ["antiair", [ // ["SmokeLauncherMag",[0,0],6], - // ["SmokeLauncherMag",[0,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], @@ -142,7 +140,6 @@ private _I_APC_Wheeled_03_cannon_F = createHashMapFromArray [ // ["4Rnd_Titan_long_missiles",[0],4] // ]], ["default",[ - ["SmokeLauncherMag",[0,0],6], ["SmokeLauncherMag",[0,0],6], ["2000Rnd_762x51_Belt_T_Red",[0],2000], ["2000Rnd_762x51_Belt_T_Red",[0],2000], @@ -154,7 +151,6 @@ private _I_APC_Wheeled_03_cannon_F = createHashMapFromArray [ ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78] ]], ["balanced",[ - ["SmokeLauncherMag",[0,0],6], ["SmokeLauncherMag",[0,0],6], ["2000Rnd_762x51_Belt_T_Red",[0],2000], ["2000Rnd_762x51_Belt_T_Red",[0],2000], From 80e203a6f5e43f3272d07fc1a0a5773b7e9c380d Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Fri, 5 Apr 2024 21:32:06 -0400 Subject: [PATCH 7/8] Used cav_dragoon_base_F instead of AAF pandur as class for cScripts functions and fix smoke loading. --- .../vehicle/fn_vehicle_addCosmeticSelection.sqf | 4 ++-- cScripts/functions/vehicle/fn_vehicle_addCosmetics.sqf | 2 +- cScripts/functions/vehicle/fn_vehicle_addFunctions.sqf | 2 +- .../vehicle/fn_vehicle_addFunctionsGlobal.sqf | 2 +- cScripts/functions/vehicle/fn_vehicle_addInventory.sqf | 2 +- cScripts/functions/vehicle/fn_vehicle_getPylon.sqf | 10 +++++----- .../vehicle/fn_vehicle_setupPylonCategories.sqf | 8 ++++---- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cScripts/functions/vehicle/fn_vehicle_addCosmeticSelection.sqf b/cScripts/functions/vehicle/fn_vehicle_addCosmeticSelection.sqf index 5f61661a0..0602061be 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addCosmeticSelection.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addCosmeticSelection.sqf @@ -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"; @@ -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"; diff --git a/cScripts/functions/vehicle/fn_vehicle_addCosmetics.sqf b/cScripts/functions/vehicle/fn_vehicle_addCosmetics.sqf index 9132a2758..047e6329a 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addCosmetics.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addCosmetics.sqf @@ -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]; diff --git a/cScripts/functions/vehicle/fn_vehicle_addFunctions.sqf b/cScripts/functions/vehicle/fn_vehicle_addFunctions.sqf index ea949362b..23a6af70a 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addFunctions.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addFunctions.sqf @@ -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); }; diff --git a/cScripts/functions/vehicle/fn_vehicle_addFunctionsGlobal.sqf b/cScripts/functions/vehicle/fn_vehicle_addFunctionsGlobal.sqf index 749e4e66c..4f675ca77 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addFunctionsGlobal.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addFunctionsGlobal.sqf @@ -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 {}; diff --git a/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf b/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf index 446858f7a..6256d98e2 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addInventory.sqf @@ -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. diff --git a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf index bb72fc4bd..85fcfc976 100644 --- a/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_getPylon.sqf @@ -117,9 +117,9 @@ private _rhsusf_m1a1tank_base = createHashMapFromArray [ ]; // I_APC_Wheeled_03_cannon_F -private _I_APC_Wheeled_03_cannon_F = createHashMapFromArray [ +private _cav_dragoon_base_F = createHashMapFromArray [ ["antiarmor", [ - ["SmokeLauncherMag",[0,0],6], + ["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], @@ -140,7 +140,7 @@ private _I_APC_Wheeled_03_cannon_F = createHashMapFromArray [ // ["4Rnd_Titan_long_missiles",[0],4] // ]], ["default",[ - ["SmokeLauncherMag",[0,0],6], + ["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], @@ -151,7 +151,7 @@ private _I_APC_Wheeled_03_cannon_F = createHashMapFromArray [ ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78] ]], ["balanced",[ - ["SmokeLauncherMag",[0,0],6], + ["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], @@ -166,7 +166,7 @@ private _I_APC_Wheeled_03_cannon_F = createHashMapFromArray [ // 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 diff --git a/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf b/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf index efdd19e41..aea3a5ee1 100644 --- a/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_setupPylonCategories.sqf @@ -33,12 +33,12 @@ 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-Personnel (default)", "default", ""], - ["I_APC_Wheeled_03_cannon_F", "Balanced", "balanced", ""], - ["I_APC_Wheeled_03_cannon_F", "Anti-Armor", "antiarmor", ""] + ["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", ""] ]; }; From 7948465e3a452f1905ac3f3d21b3d7c65aa8a529 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Fri, 5 Apr 2024 22:45:36 -0400 Subject: [PATCH 8/8] Scripted loadout --- cScripts/functions/vehicle/fn_vehicle_addDefaultLoadout.sqf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cScripts/functions/vehicle/fn_vehicle_addDefaultLoadout.sqf b/cScripts/functions/vehicle/fn_vehicle_addDefaultLoadout.sqf index 122376224..9c6bdd241 100644 --- a/cScripts/functions/vehicle/fn_vehicle_addDefaultLoadout.sqf +++ b/cScripts/functions/vehicle/fn_vehicle_addDefaultLoadout.sqf @@ -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]; \ No newline at end of file