Initial version of attack/support rework

A3A/addons/Garage/Public/fn_addVehicle.sqf

@@ -105,11 +105,9 @@ if (
 //here to allow adaption of external antistasi system without needing to addapt code under APL-ND
 private _broadcastReportedVehsAndStaticsToSave = {
     publicVariable "staticsToSave";
-    publicVariable "reportedVehs";
 };
 //_this is vehicle
 private _deleteFromReportedVehsAndStaticsToSave = {
-    reportedVehs deleteAt (reportedVehs find _this);
     staticsToSave deleteAt (staticsToSave find _this);
 };
 //_this is vehicle

A3A/addons/core/CfgFunctions.hpp

@@ -7,11 +7,11 @@ class CfgFunctions
             file = QPATHTOFOLDER(functions\AI);
             class airbomb {};
             class AIreactOnKill {};
-            class artillery {};
             class artySupport {};
             class askHelp {};
             class assaultBuilding {};
             class attackDrillAI {};
+            class attackHeli {};
             class autoHealFnc {};
             class autoLoot {};
             class autoRearm {};
@@ -20,12 +20,13 @@ class CfgFunctions
             class canFight {};
             class captureX {};
             class chargeWithSmoke {};
-            class chooseSupport {};
             class combatLanding {};
             class coverage {};
             class destroyBuilding {};
             class doFlank {};
             class enemyList {};
+            class enemyGarrison {};
+            class enemyReturnToBase {};
             class entriesLand {};
             class fastrope {};
             class findSafeRoadToUnload {};
@@ -47,7 +48,6 @@ class CfgFunctions
             class napalmDamage {};
             class napalmParticles {};
             class nearEnemy {};
-            class occupantInvaderUnitKilledEH {};
             class paradrop {};
             class rearmCall {};
             class recallGroup {};
@@ -100,17 +100,18 @@ class CfgFunctions
             file = QPATHTOFOLDER(functions\Base);
             class addActionBreachVehicle {};
             class addAggression {};
+            class addEnemyResources {};
             class addHC {};
+            class addRecentDamage {};
             class addTimeForIdle {};
             class aggressionUpdateLoop {};
             class AILoadInfo {};
             class airspaceControl {};
-            class rebelAttack {};
             class blackout {};
             class buildHQ {};
             class calculateAggression {};
             class canMoveHQ {};
-            class chooseAttackType {};
+            class chooseAttack {};
             class citiesToCivPatrol {};
             class citySupportChange {};
             class commsMP {};
@@ -122,19 +123,19 @@ class CfgFunctions
             class destroyCity {};
             class distance {};
             class distanceUnits {};
-            class economicsAI {};
             class FIAradio {};
-            class findBaseForQRF {};
+            class findAttackTargets {}
             class findBasesForConvoy {};
             class findNearestGoodRoad {};
             class flagaction {};
             class fogCheck {};
             class garbageCleaner {};
             class garrisonInfo {};
             class getAggroLevelString {};
-            class getPlayerScale {};
-            class getVehiclePoolForAttacks {};
-            class getVehiclePoolForQRFs {};
+            class getRecentDamage {};
+            class getVehiclesAirSupport {};
+            class getVehiclesGroundSupport {};
+            class getVehiclesGroundTransport {};
             class vehicleBoxHeal {};
             class initPetros {};
             class isFrontline {};
@@ -161,7 +162,6 @@ class CfgFunctions
             class rebuildAssets {};
             class rebuildRadioTower {};
             class relocateHQObjects {};
-            class remUnitCount {};
             class repairRuinedBuilding {};
             class resourceCheckSkipTime {};
             class resourcesFIA {};
@@ -217,6 +217,9 @@ class CfgFunctions
             class airportCanAttack {};
             class AIVEHinit {};
             class ambientCivs {};
+            class attackHQ {};
+            class availableBasesAir {};
+            class availableBasesLand {};
             class calculateMarkerArea {};
             class cargoSeats {};
             class CIVinit {};
@@ -228,6 +231,9 @@ class CfgFunctions
             class createAIOutposts {};
             class createAIResources {};
             class createAISite {};
+            class createAttackForceAir {};
+            class createAttackForceLand {};
+            class createAttackForceMixed {};
             class createAttackVehicle {};
             class createCIV {};
             class createFIAOutposts2 {};
@@ -254,7 +260,6 @@ class CfgFunctions
             class reinforcementsAI {};
             class registerUnitType {};
             class remoteBattle {};
-            class removeVehFromPool {};
             class safeVehicleSpawn {};
             class singleAttack {};
             class spawnGroup {};
@@ -265,7 +270,7 @@ class CfgFunctions
             class vehAvailable {};
             class VEHdespawner {};
             class vehKilledOrCaptured {};
-            class wavedCA {};
+            class wavedAttack {};
             class WPCreate {};
         };
 
@@ -299,8 +304,10 @@ class CfgFunctions
 
         class EventHandler {
             file = QPATHTOFOLDER(functions\EventHandler);
-            class addArtilleryDetectionEH {};
             class addArtilleryTrailEH {};
+            class enemyUnitDeletedEH {};
+            class enemyUnitKilledEH {};
+            class vehicleDeletedEH {};
         };
 
         class Garrison {
@@ -339,6 +346,7 @@ class CfgFunctions
             //Other initialisation functions (generally called by the above)
             class briefing {};
             class cityinfo {};
+            class clientIdleChecker {};
             class credits {};
             class initACEUnconsciousHandler {};
             class initFuncs {};
@@ -423,7 +431,6 @@ class CfgFunctions
             class AS_Official {};
             class AS_specOP {};
             class AS_Traitor {};
-            class attackHQ {};
             class CON_Outpost {};
             class convoy {};
             class DES_Antenna {};
@@ -477,25 +484,27 @@ class CfgFunctions
 
         class Pathfinding {
             file = QPATHTOFOLDER(functions\Pathfinding);
+            class addToNavCells {};
+            class addNodesNearMarkers {};
             class areNodesConnected {};
             class calculateH {};
             class convoyTest {};
             class drawGrid {};
             class drawLine {};
             class drawPath {};
+            class findLandSupportMarkers {};
+            class findNavDistance {};
             class findNodesInDistance {};
             class findPath {};
             class findPathPrecheck {};
             class findPosOnRoute {};
-            class getMainPositions {};
             class getMarkerNavPoint {};
             class getNearestNavPoint {};
             class listInsert {};
             class loadNavGrid {};
             class markNode {};
             class roadAStar {};
             class roadConnPoint {};
-            class setNavData {};
             class trimPath {};
         };
 
@@ -612,22 +621,27 @@ class CfgFunctions
         class shortID_create {};
         class shortID_format {};
         class shortID_init {};
-    };
+        };
 
         class Supports {
             file = QPATHTOFOLDER(functions\Supports);
             class addSupportTarget {};
             class calculateSupportCallReveal {};
             class clearTargetArea {};
             class createSupport {};
-            class endSupport {};
-            class initSupportCooldowns {};
-            class sendSupport {};
+            class getArtilleryRanges {};
+            class initSupports {};
+            class maxDefenceSpend {};
+            class requestArtillery {};
+            class requestSupport {};
             class showInterceptedSetupCall {};
             class showInterceptedSupportCall {};
+            class useRadioKey {};
             class SUP_airstrike {};
             class SUP_airstrikeAvailable {};
             class SUP_airstrikeRoutine {};
+            class SUP_artillery {};
+            class SUP_artilleryAvailable {};
             class SUP_ASF {};
             class SUP_ASFAvailable {};
             class SUP_ASFRoutine {};
@@ -654,13 +668,16 @@ class CfgFunctions
             class SUP_orbitalStrikeImpactEffects {};
             class SUP_orbitalStrikeBeamEffects {};
             class SUP_orbitalStrikeRoutine {};
-            class SUP_QRF {};
-            class SUP_QRFAvailable {};
+            class SUP_QRFAir {};
+            class SUP_QRFAirAvailable {};
+            class SUP_QRFLand {};
+            class SUP_QRFLandAvailable {};
             class SUP_QRFRoutine {};
             class SUP_SAM {};
             class SUP_SAMAvailable {};
             class SUP_SAMRoutine {};
-            class supportAvailable {};
+            class SUP_UAV {};
+            class SUP_UAVRoutine {};
         };
 
         class FunctionsTemplates {

A3A/addons/core/Templates/Templates.hpp

@@ -267,6 +267,11 @@ class Templates
             {
                 Occ = "LDF";
             };
+            class vt7
+            {
+                Occ = "LDF";
+                Inv = "HIDF";
+            };
             class tem_anizay : kunduz {};
             class altis
             {

A3A/addons/core/Templates/Templates/#Examples/FactionExample.sqf

@@ -17,33 +17,36 @@
 ["surrenderCrate", "Box_IND_Wps_F"] call _fnc_saveToTemplate; //Changeing this from default will require you to define logistics attachement offset for the box type
 ["equipmentBox", "Box_NATO_Equip_F"] call _fnc_saveToTemplate; //Changeing this from default will require you to define logistics attachement offset for the box type
 
+// vehicles can be placed in more than one category if they fit between both. Cost will be derived by the higher category
 ["vehiclesBasic", []] call _fnc_saveToTemplate;
 ["vehiclesLightUnarmed", []] call _fnc_saveToTemplate;
-["vehiclesLightArmed",[]] call _fnc_saveToTemplate;
+["vehiclesLightArmed", []] call _fnc_saveToTemplate;             // Should be armed, unarmoured to lightly armoured, with 0-4 passengers
 ["vehiclesTrucks", []] call _fnc_saveToTemplate;
 ["vehiclesCargoTrucks", []] call _fnc_saveToTemplate;
 ["vehiclesAmmoTrucks", []] call _fnc_saveToTemplate;
 ["vehiclesRepairTrucks", []] call _fnc_saveToTemplate;
 ["vehiclesFuelTrucks", []] call _fnc_saveToTemplate;
 ["vehiclesMedical", []] call _fnc_saveToTemplate;
-["vehiclesAPCs", []] call _fnc_saveToTemplate;
+["vehiclesLightAPCs", []] call _fnc_saveToTemplate;             // armed, lightly armoured, with 6-8 passengers 
+["vehiclesAPCs", []] call _fnc_saveToTemplate;                  // armed with enclosed turret, armoured, with 6-8 passengers
+["vehiclesIFVs", []] call _fnc_saveToTemplate;                  // capable of surviving multiple rockets, cannon armed, with 6-8 passengers
 ["vehiclesTanks", []] call _fnc_saveToTemplate;
-["vehiclesAA", []] call _fnc_saveToTemplate;
-["vehiclesLightAPCs", []] call _fnc_saveToTemplate;            //this line determines light APCs
-["vehiclesIFVs", []] call _fnc_saveToTemplate;                //this line determines IFVs
+["vehiclesAA", []] call _fnc_saveToTemplate;                    // ideally heavily armed with anti-ground capability and enclosed turret. Passengers will be ignored
 
 
 ["vehiclesTransportBoats", []] call _fnc_saveToTemplate;
 ["vehiclesGunBoats", []] call _fnc_saveToTemplate;
 ["vehiclesAmphibious", []] call _fnc_saveToTemplate;
 
-["vehiclesPlanesCAS", []] call _fnc_saveToTemplate;
-["vehiclesPlanesAA", []] call _fnc_saveToTemplate;
+["vehiclesPlanesCAS", []] call _fnc_saveToTemplate;             // Will be used with CAS script, must be defined in setPlaneLoadout. Needs fixed gun and either rockets or missiles
+["vehiclesPlanesAA", []] call _fnc_saveToTemplate;              // 
 ["vehiclesPlanesTransport", []] call _fnc_saveToTemplate;
 
-["vehiclesHelisLight", []] call _fnc_saveToTemplate;
+["vehiclesHelisLight", []] call _fnc_saveToTemplate;            // ideally fragile & unarmed helis seating 4+
 ["vehiclesHelisTransport", []] call _fnc_saveToTemplate;
-["vehiclesHelisAttack", []] call _fnc_saveToTemplate;
+// Should be capable of dealing damage to ground targets without additional scripting
+["vehiclesHelisLightAttack", []] call _fnc_saveToTemplate;      // Utility helis with fixed or door guns + rocket pods
+["vehiclesHelisAttack", []] call _fnc_saveToTemplate;           // Proper attack helis: Apache, Hind etc
 
 ["vehiclesArtillery", []] call _fnc_saveToTemplate;
 ["magazines", createHashMapFromArray []] call _fnc_saveToTemplate; //element format: [Vehicle class, [Magazines]]

A3A/addons/core/Templates/Templates/3CB/3CBBAF_Vehicle_Attributes.sqf

@@ -0,0 +1,11 @@
+["attributesVehicles", [
+
+    // Apaches stronk
+    ["UK3CB_BAF_Apache_AH1_CAS_DDPM_RM", ["cost", 350]],
+    ["UK3CB_BAF_Apache_AH1_DDPM_RM", ["cost", 350]],
+    ["UK3CB_BAF_Apache_AH1_CAS_DPMT_RM", ["cost", 350]],
+    ["UK3CB_BAF_Apache_AH1_DPMT_RM", ["cost", 350]],
+    ["UK3CB_BAF_Apache_AH1_CAS_DPMW_RM", ["cost", 350]],
+    ["UK3CB_BAF_Apache_AH1_DPMW_RM", ["cost", 350]]
+
+]] call _fnc_saveToTemplate;

A3A/addons/core/Templates/Templates/3CB/3CBFactions_Vehicle_Attributes.sqf

@@ -0,0 +1,39 @@
+["attributesVehicles", [
+
+/*
+    ["UK3CB_ADA_I_BMP2", ["cost", 120], ["threat", 150]],
+    ["UK3CB_ANA_B_BMP2", ["cost", 120], ["threat", 150]],
+    ["UK3CB_TKA_O_BMP2", ["cost", 120], ["threat", 150]],
+    ["UK3CB_TKA_O_BMP2K", ["cost", 120], ["threat", 150]],
+    ["UK3CB_TKA_B_BMP2", ["cost", 120], ["threat", 150]],
+    ["UK3CB_CW_SOV_O_LATE_BMP2", ["cost", 120], ["threat", 150]],
+    ["UK3CB_CW_SOV_O_LATE_BMP2K", ["cost", 120], ["threat", 150]],
+*/
+
+    // Strong by light-armed standards
+    ["UK3CB_AAF_B_M1117", ["cost", 80], ["threat", 100]],
+    ["UK3CB_ANA_B_M1117", ["cost", 80], ["threat", 100]],
+    ["UK3CB_TKA_O_GAZ_Vodnik_Cannon", ["cost", 80], ["threat", 100]],
+
+    // Trash planes
+    ["UK3CB_AAF_B_L39_PYLON", ["cost", 150]],
+    ["UK3CB_ANA_B_L39_PYLON", ["cost", 150]],
+    ["UK3CB_KRG_B_L39_PYLON", ["cost", 150]],
+    ["UK3CB_LDF_B_L39_PYLON", ["cost", 150]],
+    ["rhs_l159_cdf_b_CDF_CAP", ["cost", 150]],
+    ["RHSGREF_A29B_HIDF", ["cost", 120]],
+    ["UK3CB_B_Mystere_HIDF_CAS1", ["cost", 200]],           // not many missiles. Gun is actually good though
+    ["UK3CB_B_Mystere_HIDF_AA1", ["cost", 200]],            // no mid-range AA missiles
+    ["UK3CB_MDF_B_Mystere_AA1", ["cost", 200]]
+
+    // American attack helis with hellfires & chaingun, better than Russian stuff
+/*    ["UK3CB_AAF_B_AH1Z", ["cost", 300]],
+    ["UK3CB_CW_US_B_LATE_AH1Z", ["cost", 300]],
+    ["UK3CB_CW_US_B_LATE_AH1Z_CS", ["cost", 300]],
+    ["UK3CB_MDF_B_AH1Z_NAVY", ["cost", 300]],
+    ["UK3CB_MDF_B_AH1Z_CS_NAVY", ["cost", 300]],
+    ["RHS_AH1Z", ["cost", 300]],
+    ["RHS_AH1Z_CS", ["cost", 300]]
+*/
+
+]] call _fnc_saveToTemplate;

A3A/addons/core/Templates/Templates/3CB/3CB_AI_AAF.sqf

@@ -20,16 +20,18 @@
 ["vehiclesBasic", ["UK3CB_AAF_B_M1030"]] call _fnc_saveToTemplate;
 ["vehiclesLightUnarmed", ["UK3CB_AAF_B_M1151", "UK3CB_AAF_B_M998_4DR", "UK3CB_AAF_B_M998_2DR", "UK3CB_AAF_B_LR_Closed", "UK3CB_AAF_B_LR_Open"]] call _fnc_saveToTemplate;
 ["vehiclesLightArmed", ["UK3CB_AAF_B_M1151_GPK_M2", "UK3CB_AAF_B_M1151_GPK_M240", "UK3CB_AAF_B_M1151_OGPK_M2", "UK3CB_AAF_B_M1151_OGPK_M240", "UK3CB_AAF_B_SUV_Armed",
-"UK3CB_AAF_I_LR_SF_M2", "UK3CB_AAF_B_LR_M2"]] call _fnc_saveToTemplate;
+"UK3CB_AAF_I_LR_SF_M2", "UK3CB_AAF_B_LR_M2", "UK3CB_AAF_I_GAZ_Vodnik_Cannon"]] call _fnc_saveToTemplate;
 ["vehiclesTrucks", ["UK3CB_AAF_B_M939_Open", "UK3CB_AAF_B_M939", "UK3CB_AAF_B_MTVR_Closed", "UK3CB_AAF_B_MTVR_Open"]] call _fnc_saveToTemplate;
 ["vehiclesCargoTrucks", ["UK3CB_AAF_I_M939_Recovery", "UK3CB_AAF_B_MTVR_Recovery"]] call _fnc_saveToTemplate;
 ["vehiclesAmmoTrucks", ["UK3CB_AAF_B_MTVR_Reammo", "UK3CB_AAF_B_M939_Reammo"]] call _fnc_saveToTemplate;
 ["vehiclesRepairTrucks", ["UK3CB_AAF_B_M939_Repair", "UK3CB_AAF_B_MTVR_Repair"]] call _fnc_saveToTemplate;
 ["vehiclesFuelTrucks", ["UK3CB_AAF_B_MTVR_Refuel", "UK3CB_AAF_B_M939_Fuel"]] call _fnc_saveToTemplate;
 ["vehiclesMedical", ["UK3CB_AAF_B_M113_AMB"]] call _fnc_saveToTemplate;
-["vehiclesAPCs", ["UK3CB_AAF_B_LAV25", "UK3CB_AAF_B_LAV25", "UK3CB_AAF_B_AAV", "UK3CB_AAF_B_LAV25_HQ", "UK3CB_AAF_B_M113_M2", "UK3CB_AAF_B_AAV"]] call _fnc_saveToTemplate;
+["vehiclesLightAPCs", ["UK3CB_AAF_B_LAV25_HQ", "UK3CB_AAF_B_M113_M2", "UK3CB_AAF_B_M113_MK19", "UK3CB_AAF_I_GAZ_Vodnik_PKT", "UK3CB_AAF_I_GAZ_Vodnik_KVPT", "UK3CB_AAF_B_M1117"]] call _fnc_saveToTemplate;
+["vehiclesAPCs", ["UK3CB_AAF_B_LAV25", "UK3CB_AAF_B_LAV25", "UK3CB_AAF_B_AAV","UK3CB_AAF_B_AAV", "UK3CB_AAF_O_MTLB_ZU23"]] call _fnc_saveToTemplate;
+["vehiclesIFVs", []] call _fnc_saveToTemplate;
 ["vehiclesTanks", ["UK3CB_AAF_B_M60A3", "UK3CB_AAF_I_T72BC", "UK3CB_AAF_B_FV4201", "UK3CB_AAF_B_M1A1"]] call _fnc_saveToTemplate;
-["vehiclesAA", ["UK3CB_AAF_O_ZsuTank", "UK3CB_AAF_O_MTLB_ZU23"]] call _fnc_saveToTemplate; //UK3CB_AAF_O_2S6M_Tunguska
+["vehiclesAA", ["UK3CB_AAF_O_ZsuTank"]] call _fnc_saveToTemplate; //UK3CB_AAF_O_2S6M_Tunguska
 
 ["vehiclesTransportBoats", ["UK3CB_AAF_B_RHIB"]] call _fnc_saveToTemplate;
 ["vehiclesGunBoats", ["UK3CB_AAF_B_RHIB_Gunboat"]] call _fnc_saveToTemplate;
@@ -41,7 +43,8 @@
 
 ["vehiclesHelisLight", ["UK3CB_AAF_B_UH1H", "UK3CB_AAF_B_Benches_MH9", "UK3CB_AAF_B_Bell412_Utility"]] call _fnc_saveToTemplate;
 ["vehiclesHelisTransport", ["UK3CB_AAF_B_UH60M2", "UK3CB_AAF_B_UH60M", "UK3CB_AAF_O_Mi8AMT", "UK3CB_AAF_O_Mi8", "UK3CB_AAF_I_UH1H_M240"]] call _fnc_saveToTemplate;
-["vehiclesHelisAttack", ["UK3CB_AAF_B_AH1Z_GS", "UK3CB_AAF_B_AH1Z", "UK3CB_AAF_B_UH1H_GUNSHIP", "UK3CB_AAF_I_Mi_24V", "UK3CB_AAF_I_Mi8AMTSh", "UK3CB_AAF_B_Bell412_Armed", "UK3CB_AAF_B_Bell412_Armed_AT"]] call _fnc_saveToTemplate;
+["vehiclesHelisLightAttack", ["UK3CB_AAF_B_UH1H_GUNSHIP", "UK3CB_AAF_I_Mi8AMTSh", "UK3CB_AAF_B_Bell412_Armed", "UK3CB_AAF_B_Bell412_Armed_AT"]] call _fnc_saveToTemplate;
+["vehiclesHelisAttack", ["UK3CB_AAF_B_AH1Z_GS", "UK3CB_AAF_B_AH1Z", "UK3CB_AAF_I_Mi_24V"]] call _fnc_saveToTemplate;
 
 ["vehiclesArtillery", ["UK3CB_AAF_B_M109", "UK3CB_AAF_B_M270_MLRS_HE", "UK3CB_AAF_B_M270_MLRS_CLUSTER"]] call _fnc_saveToTemplate;
 ["magazines", createHashMapFromArray [
@@ -72,6 +75,8 @@
 ["minefieldAT", ["rhsusf_mine_M19"]] call _fnc_saveToTemplate;
 ["minefieldAPERS", ["rhsusf_mine_m14"]] call _fnc_saveToTemplate;
 
+#include "3CBFactions_Vehicle_Attributes.sqf"
+
 /////////////////////
 ///  Identities   ///
 /////////////////////