Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 46b0e8b
Author: stutpip123 <77023662+stutpip123@users.noreply.github.com>
Date:   Tue Aug 27 10:28:17 2024 +0100

    3AS Update

commit 3f7dd2c
Author: stutpip123 <77023662+stutpip123@users.noreply.github.com>
Date:   Thu Aug 22 17:20:32 2024 +0100

    Squashed commit of the following:

    commit 37b1f7c
    Merge: bd353e4 2b0b806
    Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
    Date:   Wed Aug 21 21:31:56 2024 +0300

        Merge pull request #289 from SilenceIsFatto/Maxx

        Builder Box Expansion

    commit 2b0b806
    Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
    Date:   Wed Aug 21 21:31:24 2024 +0300

        PreBuilt interaction place holders

    commit 9041e61
    Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
    Date:   Wed Aug 21 17:16:51 2024 +0300

        cDLC Buildable list update

    commit bd78fd4
    Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
    Date:   Wed Aug 21 09:12:25 2024 +0300

        fixed skill issues

    commit 7929eed
    Merge: 2af1b53 8b36ab1
    Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
    Date:   Tue Aug 20 20:56:25 2024 +0300

        General Readability

    commit 2af1b53
    Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
    Date:   Tue Aug 20 20:48:38 2024 +0300

        Syntax Errors

    commit 8b36ab1
    Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
    Date:   Tue Aug 20 20:11:27 2024 +0300

        Update A3A/addons/maps/Antistasi_Altis.Altis/mapInfo.hpp

        Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

    commit 7c72445
    Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
    Date:   Tue Aug 20 20:10:30 2024 +0300

        Update A3A/addons/maps/BuildObjectsList.hpp

        Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com>

    commit 24a0b0f
    Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
    Date:   Tue Aug 20 19:56:42 2024 +0300

        Update fn_buildingPlacer.sqf

    commit 93a4386
    Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
    Date:   Tue Aug 20 19:55:26 2024 +0300

        comment out instead of delete

    commit f762249
    Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com>
    Date:   Tue Aug 20 19:48:17 2024 +0300

        updated builderbox

commit e4c6889
Author: stutpip123 <77023662+stutpip123@users.noreply.github.com>
Date:   Sun Aug 18 12:17:57 2024 +0100

    Increase Vulture chance

    more entries of Vulture fighter should increase odds of use, as other planes are republic placeholders as only viable for hangars

commit 14536ed
Author: stutpip123 <77023662+stutpip123@users.noreply.github.com>
Date:   Sun Aug 18 11:27:35 2024 +0100

    CIS and Empire LargeAA and LargeCAS

commit ab78c52
Merge: c90af52 bd353e4
Author: stutpip123 <77023662+stutpip123@users.noreply.github.com>
Date:   Sat Aug 17 22:43:13 2024 +0100

    Merge branch 'unstable' into CW-AdditionalPlanes

commit c90af52
Author: stutpip123 <77023662+stutpip123@users.noreply.github.com>
Date:   Sat Aug 17 22:36:18 2024 +0100

    Update EnemyDefaults.sqf

commit c1d932b
Author: stutpip123 <77023662+stutpip123@users.noreply.github.com>
Date:   Sat Aug 17 22:25:42 2024 +0100

    PlaneLoadouts

commit 26c58ed
Author: stutpip123 <77023662+stutpip123@users.noreply.github.com>
Date:   Sat Aug 17 22:15:17 2024 +0100

    ASF, CAS + CASDive

commit 8f25b91
Author: stutpip123 <77023662+stutpip123@users.noreply.github.com>
Date:   Sat Aug 17 22:11:54 2024 +0100

    planeLoadouts

commit 891ebbd
Author: stutpip123 <77023662+stutpip123@users.noreply.github.com>
Date:   Sat Aug 17 21:49:34 2024 +0100

    more variables

commit 02ef744
Author: stutpip123 <77023662+stutpip123@users.noreply.github.com>
Date:   Sat Aug 17 21:35:23 2024 +0100

    Initial figuring out of adding new category

    trying to add vehiclesPlaneLargeAA and vehiclesPlaneLargeCAS, with intention to be used in all places normal equivalents used, except spawning in hangars
  • Loading branch information
stutpip123 committed Aug 28, 2024
1 parent 37b1f7c commit 14b7352
Show file tree
Hide file tree
Showing 20 changed files with 97 additions and 43 deletions.
20 changes: 11 additions & 9 deletions A3A/addons/core/Templates/Templates/CW/CW_AI_CIS.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
["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

["vehiclesBasic", ["lsd_car_ast"]] call _fnc_saveToTemplate; //this line determines basic vehicles, the lightest kind available. -- Example: ["vehiclesBasic", ["B_Quadbike_01_F"]] -- Array, can contain multiple assets
["vehiclesBasic", ["3AS_Fliknot_F"]] call _fnc_saveToTemplate; //this line determines basic vehicles, the lightest kind available. -- Example: ["vehiclesBasic", ["B_Quadbike_01_F"]] -- Array, can contain multiple assets
["vehiclesLightUnarmed", ["3AS_ISP_Transport"]] call _fnc_saveToTemplate;
["vehiclesLightArmed",["3AS_ISP", "3AS_ISP", "lsd_car_ast"]] call _fnc_saveToTemplate;
["vehiclesTrucks", ["442_argon_covered_cis", "442_argon_transport_cis"]] call _fnc_saveToTemplate;
["vehiclesTrucks", ["442_argon_covered_cis"]] call _fnc_saveToTemplate;
["vehiclesCargoTrucks", ["442_argon_covered_cis", "442_argon_transport_cis"]] call _fnc_saveToTemplate;
["vehiclesAmmoTrucks", ["442_argon_ammo_cis"]] call _fnc_saveToTemplate;
["vehiclesRepairTrucks", ["3AS_SAC_Repair_F"]] call _fnc_saveToTemplate;
Expand All @@ -30,16 +30,18 @@
["vehiclesAirborne", ["3AS_Advanced_DSD", "3AS_ISP", "3AS_PAC_F"]] call _fnc_saveToTemplate;
["vehiclesAPCs", ["3AS_PAC_F"]] call _fnc_saveToTemplate;
["vehiclesIFVs", ["3AS_AAT_CIS"]] call _fnc_saveToTemplate;
["vehiclesLightTanks", ["3AS_n99","3AS_Advanced_DSD"]] call _fnc_saveToTemplate;
["vehiclesTanks", ["3AS_AAT_CIS", "3AS_GAT", "3AS_n99"]] call _fnc_saveToTemplate;
["vehiclesLightTanks", ["3AS_N99","3AS_Advanced_DSD"]] call _fnc_saveToTemplate;
["vehiclesTanks", ["3AS_AAT_CIS", "3AS_GAT", "3AS_N99"]] call _fnc_saveToTemplate;
["vehiclesAA", ["3AS_GAT_Light"]] call _fnc_saveToTemplate;

["vehiclesTransportBoats", ["B_Boat_Transport_01_F"]] call _fnc_saveToTemplate;
["vehiclesGunBoats", ["442_boat_armed"]] call _fnc_saveToTemplate;
["vehiclesAmphibious", []] call _fnc_saveToTemplate;

["vehiclesPlanesCAS", ["3AS_Tri_Fighter_DynamicLoadout"]] call _fnc_saveToTemplate;
["vehiclesPlanesCAS", ["3AS_BTLB_Bomber_Shadow"]] call _fnc_saveToTemplate;
["vehiclesPlanesLargeCAS", ["3AS_CIS_Vulture_CAS_F","3AS_CIS_Vulture_CAS_F","3AS_CIS_Vulture_CAS_F","3AS_CIS_Vulture_CAS_F","3AS_CIS_Vulture_CAS_F","3AS_CIS_Vulture_CAS_F"]] call _fnc_saveToTemplate;
["vehiclesPlanesAA", ["3AS_Z95_Blue"]] call _fnc_saveToTemplate;
["vehiclesPlanesLargeAA", ["3AS_CIS_Vulture_AA_F","3AS_CIS_Vulture_AA_F","3AS_CIS_Vulture_AA_F","3AS_CIS_Vulture_AA_F","3AS_CIS_Vulture_AA_F","3AS_CIS_Vulture_AA_F"]] call _fnc_saveToTemplate;
["vehiclesPlanesTransport", ["3AS_Civilian_Transport_01"]] call _fnc_saveToTemplate;

["vehiclesPlanesGunship", ["ls_cis_hmp","3AS_HMP_Gunship"]] call _fnc_saveToTemplate;
Expand All @@ -58,14 +60,14 @@
["uavsPortable", ["3as_CIS_ScavDroid"]] call _fnc_saveToTemplate;

//Config special vehicles - militia vehicles are mostly used in the early game, police cars are being used by troops around cities -- Example:
["vehiclesMilitiaLightArmed", ["lsd_car_ast"]] call _fnc_saveToTemplate;
["vehiclesMilitiaTrucks", ["442_argon_covered_cis", "442_argon_transport_cis"]] call _fnc_saveToTemplate;
["vehiclesMilitiaLightArmed", ["3AS_ISP"]] call _fnc_saveToTemplate;
["vehiclesMilitiaTrucks", ["442_argon_transport_cis"]] call _fnc_saveToTemplate;
["vehiclesMilitiaCars", ["3AS_ISP_Transport"]] call _fnc_saveToTemplate;
["vehiclesMilitiaAPCs", ["3as_SAC_Trade"]] call _fnc_saveToTemplate;
["vehiclesMilitiaAPCs", ["3AS_SAC_F"]] call _fnc_saveToTemplate;

["vehiclesPolice", ["3AS_ISP_Transport"]] call _fnc_saveToTemplate;

["staticMGs", ["3AS_HeavyRepeater_Unarmoured"]] call _fnc_saveToTemplate;
["staticMGs", ["3AS_J10s_F"]] call _fnc_saveToTemplate;
["staticAT", ["3as_ParticleCannon"]] call _fnc_saveToTemplate;
["staticAA", ["AA_Turret"]] call _fnc_saveToTemplate;
["staticMortars", ["3AS_CIS_Mortar"]] call _fnc_saveToTemplate;
Expand Down
20 changes: 11 additions & 9 deletions A3A/addons/core/Templates/Templates/CW/CW_AI_CIS_WBK.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
["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

["vehiclesBasic", ["lsd_car_ast"]] call _fnc_saveToTemplate; //this line determines basic vehicles, the lightest kind available. -- Example: ["vehiclesBasic", ["B_Quadbike_01_F"]] -- Array, can contain multiple assets
["vehiclesBasic", ["3AS_Fliknot_F"]] call _fnc_saveToTemplate; //this line determines basic vehicles, the lightest kind available. -- Example: ["vehiclesBasic", ["B_Quadbike_01_F"]] -- Array, can contain multiple assets
["vehiclesLightUnarmed", ["3AS_ISP_Transport"]] call _fnc_saveToTemplate;
["vehiclesLightArmed",["3AS_ISP", "3AS_ISP", "lsd_car_ast"]] call _fnc_saveToTemplate;
["vehiclesTrucks", ["442_argon_covered_cis", "442_argon_transport_cis"]] call _fnc_saveToTemplate;
["vehiclesTrucks", ["442_argon_covered_cis"]] call _fnc_saveToTemplate;
["vehiclesCargoTrucks", ["442_argon_covered_cis", "442_argon_transport_cis"]] call _fnc_saveToTemplate;
["vehiclesAmmoTrucks", ["442_argon_ammo_cis"]] call _fnc_saveToTemplate;
["vehiclesRepairTrucks", ["3AS_SAC_Repair_F"]] call _fnc_saveToTemplate;
Expand All @@ -30,24 +30,26 @@
["vehiclesAirborne", ["3AS_Advanced_DSD", "3AS_ISP", "3AS_PAC_F"]] call _fnc_saveToTemplate;
["vehiclesAPCs", ["3AS_PAC_F"]] call _fnc_saveToTemplate;
["vehiclesIFVs", ["3AS_AAT_CIS"]] call _fnc_saveToTemplate;
["vehiclesLightTanks", ["3AS_n99","3AS_Advanced_DSD"]] call _fnc_saveToTemplate;
["vehiclesTanks", ["3AS_AAT_CIS", "3AS_GAT", "3AS_n99"]] call _fnc_saveToTemplate;
["vehiclesLightTanks", ["3AS_N99","3AS_Advanced_DSD"]] call _fnc_saveToTemplate;
["vehiclesTanks", ["3AS_AAT_CIS", "3AS_GAT", "3AS_N99"]] call _fnc_saveToTemplate;
["vehiclesAA", ["3AS_GAT_Light"]] call _fnc_saveToTemplate;

["vehiclesTransportBoats", ["B_Boat_Transport_01_F"]] call _fnc_saveToTemplate;
["vehiclesGunBoats", ["442_boat_armed"]] call _fnc_saveToTemplate;
["vehiclesAmphibious", []] call _fnc_saveToTemplate;

["vehiclesPlanesCAS", ["3AS_BTLB_Bomber_Shadow"]] call _fnc_saveToTemplate;
["vehiclesPlanesLargeCAS", ["3AS_CIS_Vulture_CAS_F","3AS_CIS_Vulture_CAS_F","3AS_CIS_Vulture_CAS_F","3AS_CIS_Vulture_CAS_F","3AS_CIS_Vulture_CAS_F","3AS_CIS_Vulture_CAS_F"]] call _fnc_saveToTemplate;
["vehiclesPlanesAA", ["3AS_Z95_Blue"]] call _fnc_saveToTemplate;
["vehiclesPlanesLargeAA", ["3AS_CIS_Vulture_AA_F","3AS_CIS_Vulture_AA_F","3AS_CIS_Vulture_AA_F","3AS_CIS_Vulture_AA_F","3AS_CIS_Vulture_AA_F","3AS_CIS_Vulture_AA_F"]] call _fnc_saveToTemplate;
["vehiclesPlanesTransport", ["3AS_Civilian_Transport_01"]] call _fnc_saveToTemplate;

["vehiclesPlanesGunship", ["ls_cis_hmp","3AS_HMP_Gunship"]] call _fnc_saveToTemplate;

["vehiclesHelisLight", ["3AS_Patrol_LAAT_Police"]] call _fnc_saveToTemplate; //this line determines light helis -- Example: ["vehiclesHelisLight", ["B_Heli_Light_01_F"]] -- Array, can contain multiple assets
["vehiclesHelisTransport", ["3AS_HMP_Transport", "3AS_MAF_Transport_F"]] call _fnc_saveToTemplate; //this line determines transport helis -- Example: ["vehiclesHelisTransport", ["B_Heli_Transport_01_F"]] -- Array, can contain multiple assets
["vehiclesHelisLightAttack", ["3AS_MAF_Gunship_F"]] call _fnc_saveToTemplate;
["vehiclesHelisAttack", ["3AS_HMP_Gunship"]] call _fnc_saveToTemplate;
["vehiclesHelisAttack", ["3AS_HMP_Gunship"]] call _fnc_saveToTemplate;

["vehiclesArtillery", ["3AS_Hailfire_Rocket"]] call _fnc_saveToTemplate;
["magazines", createHashMapFromArray [
Expand All @@ -58,14 +60,14 @@
["uavsPortable", ["3as_CIS_ScavDroid"]] call _fnc_saveToTemplate;

//Config special vehicles - militia vehicles are mostly used in the early game, police cars are being used by troops around cities -- Example:
["vehiclesMilitiaLightArmed", ["lsd_car_ast"]] call _fnc_saveToTemplate;
["vehiclesMilitiaTrucks", ["442_argon_covered_cis", "442_argon_transport_cis"]] call _fnc_saveToTemplate;
["vehiclesMilitiaLightArmed", ["3AS_ISP"]] call _fnc_saveToTemplate;
["vehiclesMilitiaTrucks", ["442_argon_transport_cis"]] call _fnc_saveToTemplate;
["vehiclesMilitiaCars", ["3AS_ISP_Transport"]] call _fnc_saveToTemplate;
["vehiclesMilitiaAPCs", ["3as_SAC_Trade"]] call _fnc_saveToTemplate;
["vehiclesMilitiaAPCs", ["3AS_SAC_F"]] call _fnc_saveToTemplate;

["vehiclesPolice", ["3AS_ISP_Transport"]] call _fnc_saveToTemplate;

["staticMGs", ["3AS_HeavyRepeater_Unarmoured"]] call _fnc_saveToTemplate;
["staticMGs", ["3AS_J10s_F"]] call _fnc_saveToTemplate;
["staticAT", ["3as_ParticleCannon"]] call _fnc_saveToTemplate;
["staticAA", ["AA_Turret"]] call _fnc_saveToTemplate;
["staticMortars", ["3AS_CIS_Mortar"]] call _fnc_saveToTemplate;
Expand Down
6 changes: 4 additions & 2 deletions A3A/addons/core/Templates/Templates/CW/CW_AI_REP.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
["vehiclesAmphibious", []] call _fnc_saveToTemplate;

["vehiclesPlanesCAS", ["3AS_BTLB_Bomber"]] call _fnc_saveToTemplate;
["vehiclesPlanesAA", ["3AS_Z95_Republic","3as_Vwing_base"]] call _fnc_saveToTemplate;
["vehiclesPlanesLargeCAS", ["3AS_ARC_170_Red"]] call _fnc_saveToTemplate;
["vehiclesPlanesAA", ["3AS_Z95_Republic","3as_Vwing_base", "3AS_Delta7_F"]] call _fnc_saveToTemplate;
["vehiclesPlanesLargeAA", ["3AS_ARC_170_Red","3as_V19_base"]] call _fnc_saveToTemplate;
["vehiclesPlanesTransport", ["3AS_Republic_Transport_01"]] call _fnc_saveToTemplate;

["vehiclesPlanesGunship", ["3AS_LAAT_Mk1","lsd_heli_laati"]] call _fnc_saveToTemplate;
Expand Down Expand Up @@ -73,7 +75,7 @@
["staticHowitzers", []] call _fnc_saveToTemplate;

["vehicleRadar", "lsd_cis_radarDish"] call _fnc_saveToTemplate;
["vehicleSam", "3as_XX9"] call _fnc_saveToTemplate;
["vehicleSam", "3AS_Keeradak_F"] call _fnc_saveToTemplate;

["howitzerMagazineHE", ""] call _fnc_saveToTemplate;

Expand Down
6 changes: 4 additions & 2 deletions A3A/addons/core/Templates/Templates/CW/CW_AI_REP_WBK.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
["vehiclesAmphibious", []] call _fnc_saveToTemplate;

["vehiclesPlanesCAS", ["3AS_BTLB_Bomber"]] call _fnc_saveToTemplate;
["vehiclesPlanesAA", ["3AS_Z95_Republic","3as_Vwing_base"]] call _fnc_saveToTemplate;
["vehiclesPlanesLargeCAS", ["3AS_ARC_170_Red"]] call _fnc_saveToTemplate;
["vehiclesPlanesAA", ["3AS_Z95_Republic","3as_Vwing_base", "3AS_Delta7_F"]] call _fnc_saveToTemplate;
["vehiclesPlanesLargeAA", ["3AS_ARC_170_Red","3as_V19_base"]] call _fnc_saveToTemplate;
["vehiclesPlanesTransport", ["3AS_Republic_Transport_01"]] call _fnc_saveToTemplate;

["vehiclesPlanesGunship", ["3AS_LAAT_Mk1","lsd_heli_laati"]] call _fnc_saveToTemplate;
Expand Down Expand Up @@ -73,7 +75,7 @@
["staticHowitzers", []] call _fnc_saveToTemplate;

["vehicleRadar", "lsd_cis_radarDish"] call _fnc_saveToTemplate;
["vehicleSam", "3as_XX9"] call _fnc_saveToTemplate;
["vehicleSam", "3AS_Keeradak_F"] call _fnc_saveToTemplate;

["howitzerMagazineHE", ""] call _fnc_saveToTemplate;

Expand Down
4 changes: 3 additions & 1 deletion A3A/addons/core/Templates/Templates/CW/WM_AI_EMP.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@
["vehiclesAmphibious", []] call _fnc_saveToTemplate;

["vehiclesPlanesCAS", ["WM_TieBomber_Cluster"]] call _fnc_saveToTemplate;
["vehiclesPlanesLargeCAS", ["WM_TieDefender"]] call _fnc_saveToTemplate;
["vehiclesPlanesAA", ["WM_TieInterceptor","WM_TieInterceptor","3AS_VWing_Imperial","3AS_VWing_Imperial","WM_TieAdvanced"]] call _fnc_saveToTemplate;
["vehiclesPlanesLargeAA", ["WM_Tiefighter","WM_Tiefighter","WM_Tiefighter","WM_Tiefighter","WM_Tiefighter"]] call _fnc_saveToTemplate;
["vehiclesPlanesTransport", ["3AS_Imperial_Transport_01"]] call _fnc_saveToTemplate;

["vehiclesPlanesGunship", ["3AS_LAAT_Mk1_Imperial"]] call _fnc_saveToTemplate;
Expand Down Expand Up @@ -75,7 +77,7 @@
["staticHowitzers", []] call _fnc_saveToTemplate;

["vehicleRadar", "lsd_cis_radarDish"] call _fnc_saveToTemplate;
["vehicleSam", "3as_XX9"] call _fnc_saveToTemplate;
["vehicleSam", "3AS_Keeradak_Imperial"] call _fnc_saveToTemplate;

["howitzerMagazineHE", ""] call _fnc_saveToTemplate;

Expand Down
4 changes: 3 additions & 1 deletion A3A/addons/core/Templates/Templates/CW/WM_AI_EMP_Arctic.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@
["vehiclesAmphibious", []] call _fnc_saveToTemplate;

["vehiclesPlanesCAS", ["WM_TieBomber_Cluster"]] call _fnc_saveToTemplate;
["vehiclesPlanesLargeCAS", ["WM_TieDefender"]] call _fnc_saveToTemplate;
["vehiclesPlanesAA", ["WM_TieInterceptor","WM_TieInterceptor","3AS_VWing_Imperial","3AS_VWing_Imperial","WM_TieAdvanced"]] call _fnc_saveToTemplate;
["vehiclesPlanesLargeAA", ["WM_Tiefighter","WM_Tiefighter","WM_Tiefighter","WM_Tiefighter","WM_Tiefighter"]] call _fnc_saveToTemplate;
["vehiclesPlanesTransport", ["3AS_Imperial_Transport_01"]] call _fnc_saveToTemplate;

["vehiclesPlanesGunship", ["3AS_LAAT_Mk1_Imperial"]] call _fnc_saveToTemplate;
Expand Down Expand Up @@ -75,7 +77,7 @@
["staticHowitzers", []] call _fnc_saveToTemplate;

["vehicleRadar", "lsd_cis_radarDish"] call _fnc_saveToTemplate;
["vehicleSam", "3as_XX9"] call _fnc_saveToTemplate;
["vehicleSam", "3AS_Keeradak_Imperial"] call _fnc_saveToTemplate;

["howitzerMagazineHE", ""] call _fnc_saveToTemplate;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
["animations", []] call _fnc_saveToTemplate;
["variants", []] call _fnc_saveToTemplate;

["vehiclesPlanesLargeCAS", []] call _fnc_saveToTemplate;
["vehiclesPlanesLargeAA", []] call _fnc_saveToTemplate;

["flares", ["F_40mm_white", "F_40mm_Red", "F_40mm_Yellow", "F_40mm_Green"]] call _fnc_saveToTemplate;

["smallBunker", "Land_BagBunker_Small_F"] call _fnc_saveToTemplate;
Expand Down
2 changes: 1 addition & 1 deletion A3A/addons/core/functions/Base/fn_sellVehicle.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ private _costs = call {
or (_typeX in FactionGet(all,"vehiclesAA"))
or (_typeX in FactionGet(all,"vehiclesArtillery"))
) exitWith {6500};
if (_typeX in (FactionGet(all,"vehiclesPlanesCAS") + FactionGet(all,"vehiclesPlanesAA"))) exitWith {7500};
if (_typeX in (FactionGet(all,"vehiclesPlanesCAS") + FactionGet(all,"vehiclesPlanesAA") + FactionGet(all,"vehiclesPlanesLargeAA") + FactionGet(all,"vehiclesPlanesLargeCAS"))) exitWith {7500};
if (_typeX in (FactionGet(all,"vehiclesPlanesGunship"))) exitWith {10000};
0;
};
Expand Down
11 changes: 6 additions & 5 deletions A3A/addons/core/functions/Base/fn_setPlaneLoadout.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,8 @@ if (_type == "CASDIVE") then
_plane setVariable ["diveParams", [1200, 350, 110, 55, 15, [3, 0]]]; // start (m), end (m), diveSpeed (m/s), dive start angle (deg), turnRate (deg/s), bombOffset (m)
};
// Clone Wars Planes (3AS)
case "3AS_ARC_170_Yellow";
case "3AS_ARC_170_Red";
case "3AS_ARC_170_Yellow";
case "3AS_ARC_170_Orange";
case "3AS_ARC_170_Green";
case "3AS_ARC_170_Blue":
Expand Down Expand Up @@ -1093,7 +1094,8 @@ if (_type == "CAS") then
_plane setVariable ["diveParams", [1200, 350, 110, 55, 15, [3, 0]]]; // start (m), end (m), diveSpeed (m/s), dive start angle (deg), turnRate (deg/s), bombOffset (m)
};
// Clone Wars Planes (3AS)
case "3AS_ARC_170_Yellow";
case "3AS_ARC_170_Red";
case "3AS_ARC_170_Yellow";
case "3AS_ARC_170_Orange";
case "3AS_ARC_170_Green";
case "3AS_ARC_170_Blue":
Expand Down Expand Up @@ -1159,7 +1161,6 @@ if (_type == "CAS") then
case "3AS_Delta7_TANO";
case "3AS_Delta7_ANI";
case "3AS_Delta7_Blue";
case "3AS_Delta7_F";
case "3AS_Delta7_Orange";
case "3AS_Delta7_PLO";
case "3AS_Delta7_Purple";
Expand Down Expand Up @@ -1618,7 +1619,8 @@ if (_type == "AA") then
_loadout = ["LIB_1Rnd_SC250"];
};
// Clone Wars Planes (3AS)
case "3AS_ARC_170_Yellow";
case "3AS_ARC_170_Red";
case "3AS_ARC_170_Yellow";
case "3AS_ARC_170_Orange";
case "3AS_ARC_170_Green";
case "3AS_ARC_170_Blue":
Expand Down Expand Up @@ -1675,7 +1677,6 @@ if (_type == "AA") then
case "3AS_Delta7_TANO";
case "3AS_Delta7_ANI";
case "3AS_Delta7_Blue";
case "3AS_Delta7_F";
case "3AS_Delta7_Orange";
case "3AS_Delta7_PLO";
case "3AS_Delta7_Purple";
Expand Down
2 changes: 2 additions & 0 deletions A3A/addons/core/functions/CREATE/fn_createAIAirplane.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,8 @@ if (!_busy) then {
+ (_faction get "vehiclesHelisTransport")
+ (_faction get "vehiclesPlanesCAS")
+ (_faction get "vehiclesPlanesAA")
+ (_faction get "vehiclesPlanesLargeCAS")
+ (_faction get "vehiclesPlanesLargeAA")
+ (_faction get "vehiclesPlanesTransport");
+ (_faction getOrDefault ["vehiclesPlanesGunship", []]);
+ (_faction getOrDefault ["uavsAttack", []]);
Expand Down
4 changes: 4 additions & 0 deletions A3A/addons/core/functions/Garrison/fn_checkVehicleType.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ params ["_vehicle", "_preference"];
|| {_vehicle in FactionGet(inv,"vehiclesPlanesCAS")} \
|| {_vehicle in FactionGet(inv,"vehiclesPlanesAA")} \
|| {_vehicle in FactionGet(occ,"vehiclesPlanesGunship")} \
|| {_vehicle in FactionGet(occ,"vehiclesPlanesLargeCAS")} \
|| {_vehicle in FactionGet(inv,"vehiclesPlanesLargeAA")} \
|| {_vehicle in FactionGet(occ,"vehiclesPlanesLargeAA")} \
|| {_vehicle in FactionGet(inv,"vehiclesPlanesLargeCAS")} \
|| {_vehicle in FactionGet(inv,"vehiclesPlanesGunship")}

//TODO this does not work properly (maybe even throws errors) as the template files arent
Expand Down
2 changes: 1 addition & 1 deletion A3A/addons/core/functions/REINF/fn_addBombRun.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ if (_exit) exitWith {
private _pointsX = 1;

if (_typeX in FactionGet(all,"vehiclesHelisAttack")) then {_pointsX = 5};
if (_typeX in (OccAndInv("vehiclesPlanesCAS") + OccAndInv("vehiclesPlanesAA") + OccAndInv("vehiclesPlanesGunship"))) then {_pointsX = 10};
if (_typeX in (OccAndInv("vehiclesPlanesCAS") + OccAndInv("vehiclesPlanesAA") + OccAndInv("vehiclesPlanesLargeAA") + OccAndInv("vehiclesPlanesLargeCAS") + OccAndInv("vehiclesPlanesGunship"))) then {_pointsX = 10};

deleteVehicle _veh;

Expand Down
2 changes: 1 addition & 1 deletion A3A/addons/core/functions/Supports/fn_SUP_ASF.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ private _airport = [_side, _targPos] call A3A_fnc_availableBasesAir;
if (isNil "_airport") exitWith { Debug_1("No airport found for %1 support", _supportName); -1; };

private _faction = Faction(_side);
private _vehType = selectRandom (_faction get "vehiclesPlanesAA");
private _vehType = selectRandom ((_faction get "vehiclesPlanesAA") + (_faction get "vehiclesPlanesLargeAA"));

private _aggro = if(_side == Occupants) then {aggressionOccupants} else {aggressionInvaders};
if (_delay < 0) then { _delay = (0.5 + random 1) * (600 - 15*tierWar - 1*_aggro) };
Expand Down
2 changes: 1 addition & 1 deletion A3A/addons/core/functions/Supports/fn_SUP_CAS.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ private _airport = [_side, _targPos] call A3A_fnc_availableBasesAir;
if (isNil "_airport") exitWith { Debug_1("No airport found for %1 support", _supportName); -1; };

private _faction = Faction(_side);
private _vehType = selectRandom (_faction get "vehiclesPlanesCAS");
private _vehType = selectRandom ((_faction get "vehiclesPlanesCAS") + (_faction get "vehiclesPlanesLargeCAS"));

private _aggro = if(_side == Occupants) then {aggressionOccupants} else {aggressionInvaders};
if (_delay < 0) then { _delay = (0.5 + random 1) * (450 - 15*tierWar - 1*_aggro) };
Expand Down
2 changes: 1 addition & 1 deletion A3A/addons/core/functions/Supports/fn_SUP_CASDive.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ private _airport = [_side, _targPos] call A3A_fnc_availableBasesAir;
if (isNil "_airport") exitWith { Debug_1("No airport found for %1 support", _supportName); -1; };

private _faction = Faction(_side);
private _vehType = selectRandom (_faction get "vehiclesPlanesCAS");
private _vehType = selectRandom ((_faction get "vehiclesPlanesCAS") + (_faction get "vehiclesPlanesLargeCAS"));

private _aggro = if(_side == Occupants) then {aggressionOccupants} else {aggressionInvaders};
if (_delay < 0) then { _delay = (0.5 + random 1) * (450 - 15*tierWar - 1*_aggro) };
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ params ["_target", "_side", "_maxSpend", "_availTypes"];
// - static AA
// - AA tanks/trucks
// TODO: Rework vehicle type system to handle this shit better
private _allAA = (A3A_faction_all get "vehiclesPlanesAA") + (A3A_faction_all get "vehiclesAA") + (A3A_faction_all get "staticAA");
private _allAA = (A3A_faction_all get "vehiclesPlanesAA") + (A3A_faction_all get "vehiclesPlanesLargeAA") + (A3A_faction_all get "vehiclesAA") + (A3A_faction_all get "staticAA");
if (typeOf _target in _allAA) exitWith { 0 };

// Otherwise fine?
Expand Down
Loading

0 comments on commit 14b7352

Please sign in to comment.