From e12bf11cf017829f95a61704833089bba6961351 Mon Sep 17 00:00:00 2001 From: Igor Kiselev Date: Sun, 27 Aug 2023 11:03:08 +0300 Subject: [PATCH] hotfix finale --- .../core/Templates/Templates/Aegis/Aegis_Reb_FIA.sqf | 8 ++++++++ .../core/Templates/Templates/Aegis/Aegis_Reb_LM.sqf | 10 +++++++++- .../core/Templates/Templates/Aegis/Aegis_Reb_SDK.sqf | 8 ++++++++ .../Templates/Templates/Vanilla/Vanilla_Reb_FIA.sqf | 9 ++++++++- .../Templates/Templates/Vanilla/Vanilla_Reb_LL.sqf | 9 ++++++++- .../Templates/Templates/Vanilla/Vanilla_Reb_SDK.sqf | 9 ++++++++- .../core/functions/REINF/fn_addBlackMarketVeh.sqf | 1 + ForkChangelog.md | 1 + 8 files changed, 51 insertions(+), 4 deletions(-) diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_FIA.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_FIA.sqf index 4e30c694c8..8c618e9573 100644 --- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_FIA.sqf +++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_FIA.sqf @@ -79,13 +79,21 @@ private _shopWs = if (_hasWs) then { private _vehiclesBlackMarket = _shopWs + [ ["I_UAV_01_F", 2000, "UAV", {true}], ["I_LT_01_AA_F", 7500, "AA", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count (milbases + airportsX) > 0}], + ["I_LT_01_scout_F", 7500, "AA", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count (milbases + airportsX) > 0}], + ["I_LT_01_cannon_F", 10000, "TANK", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count (milbases + airportsX) > 0}], + ["I_LT_01_AT_F", 11000, "TANK", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count (milbases + airportsX) > 0}], ["I_G_APC_Wheeled_03_cannon_F", 15000, "APC", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count seaports > 0}], + ["I_Heli_Light_01_F", 7000, "HELI", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count airportsX > 0}], ["I_Heli_Light_01_dynamicLoadout_F", 25000, "HELI", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count airportsX > 0}] ]; ["blackMarketStock", _vehiclesBlackMarket] call _fnc_saveToTemplate; ["variants", [ ["I_LT_01_AA_F", ["Indep_Olive",1]], + ["I_LT_01_scout_F", ["Indep_Olive",1]], + ["I_LT_01_cannon_F", ["Indep_Olive",1]], + ["I_LT_01_AT_F", ["Indep_Olive",1]], + ["I_Heli_Light_01_F", ["Black",1]], ["I_Heli_Light_01_dynamicLoadout_F", ["Black",1]] ]] call _fnc_saveToTemplate; diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_LM.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_LM.sqf index d1ef7e3dff..49140f3bcd 100644 --- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_LM.sqf +++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_LM.sqf @@ -79,13 +79,21 @@ private _shopWs = if (_hasWs) then { private _vehiclesBlackMarket = _shopWs + [ ["I_UAV_01_F", 2000, "UAV", {true}], ["I_LT_01_AA_F", 7500, "AA", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count (milbases + airportsX) > 0}], - ["Opf_B_P_APC_Wheeled_03_cannon_F", 15000, "APC", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count seaports > 0}], + ["I_LT_01_scout_F", 7500, "AA", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count (milbases + airportsX) > 0}], + ["I_LT_01_cannon_F", 10000, "TANK", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count (milbases + airportsX) > 0}], + ["I_LT_01_AT_F", 11000, "TANK", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count (milbases + airportsX) > 0}], + ["I_G_APC_Wheeled_03_cannon_F", 15000, "APC", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count seaports > 0}], + ["I_Heli_Light_01_F", 7000, "HELI", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count airportsX > 0}], ["I_Heli_Light_01_dynamicLoadout_F", 25000, "HELI", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count airportsX > 0}] ]; ["blackMarketStock", _vehiclesBlackMarket] call _fnc_saveToTemplate; ["variants", [ ["I_LT_01_AA_F", ["Indep_Olive",1]], + ["I_LT_01_scout_F", ["Indep_Olive",1]], + ["I_LT_01_cannon_F", ["Indep_Olive",1]], + ["I_LT_01_AT_F", ["Indep_Olive",1]], + ["I_Heli_Light_01_F", ["Black",1]], ["I_Heli_Light_01_dynamicLoadout_F", ["Black",1]] ]] call _fnc_saveToTemplate; diff --git a/A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_SDK.sqf b/A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_SDK.sqf index c86c10d721..1ee2f27cb6 100644 --- a/A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_SDK.sqf +++ b/A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_SDK.sqf @@ -72,13 +72,21 @@ private _shopWs = if (_hasWs) then { private _vehiclesBlackMarket = _shopWs + [ ["I_UAV_01_F", 2000, "UAV", {true}], ["I_LT_01_AA_F", 7500, "AA", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count (milbases + airportsX) > 0}], + ["I_LT_01_scout_F", 7500, "AA", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count (milbases + airportsX) > 0}], + ["I_LT_01_cannon_F", 10000, "TANK", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count (milbases + airportsX) > 0}], + ["I_LT_01_AT_F", 11000, "TANK", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count (milbases + airportsX) > 0}], ["I_G_APC_Wheeled_03_cannon_F", 15000, "APC", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count seaports > 0}], + ["I_Heli_Light_01_F", 7000, "HELI", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count airportsX > 0}], ["I_Heli_Light_01_dynamicLoadout_F", 25000, "HELI", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count airportsX > 0}] ]; ["blackMarketStock", _vehiclesBlackMarket] call _fnc_saveToTemplate; ["variants", [ ["I_LT_01_AA_F", ["Indep_Olive",1]], + ["I_LT_01_scout_F", ["Indep_Olive",1]], + ["I_LT_01_cannon_F", ["Indep_Olive",1]], + ["I_LT_01_AT_F", ["Indep_Olive",1]], + ["I_Heli_Light_01_F", ["Black",1]], ["I_Heli_Light_01_dynamicLoadout_F", ["Black",1]] ]] call _fnc_saveToTemplate; diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_FIA.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_FIA.sqf index 5d2304312a..2e596000d3 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_FIA.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_FIA.sqf @@ -79,14 +79,21 @@ private _shopWs = if (_hasWs) then { private _vehiclesBlackMarket = _shopWs + [ ["I_UAV_01_F", 2000, "UAV", {true}], ["I_LT_01_AA_F", 7500, "AA", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count (milbases + airportsX) > 0}], + ["I_LT_01_scout_F", 7500, "AA", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count (milbases + airportsX) > 0}], + ["I_LT_01_cannon_F", 10000, "TANK", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count (milbases + airportsX) > 0}], + ["I_LT_01_AT_F", 11000, "TANK", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count (milbases + airportsX) > 0}], ["I_APC_Wheeled_03_cannon_F", 15000, "APC", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count seaports > 0}], + ["B_Heli_Light_01_F", 7000, "HELI", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count airportsX > 0}], ["B_Heli_Light_01_dynamicLoadout_F", 25000, "HELI", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count airportsX > 0}] ]; ["blackMarketStock", _vehiclesBlackMarket] call _fnc_saveToTemplate; ["variants", [ ["I_APC_Wheeled_03_cannon_F", ["Guerilla_01",1]], - ["I_LT_01_AA_F", ["Indep_Olive",1]] + ["I_LT_01_AA_F", ["Indep_Olive",1]], + ["I_LT_01_scout_F", ["Indep_Olive",1]], + ["I_LT_01_cannon_F", ["Indep_Olive",1]], + ["I_LT_01_AT_F", ["Indep_Olive",1]] ]] call _fnc_saveToTemplate; #include "Vanilla_Reb_Vehicle_Attributes.sqf" diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_LL.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_LL.sqf index 6f4b707c79..7a2cbc01ae 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_LL.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_LL.sqf @@ -79,14 +79,21 @@ private _shopWs = if (_hasWs) then { private _vehiclesBlackMarket = _shopWs + [ ["I_UAV_01_F", 2000, "UAV", {true}], ["I_LT_01_AA_F", 7500, "AA", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count (milbases + airportsX) > 0}], + ["I_LT_01_scout_F", 7500, "AA", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count (milbases + airportsX) > 0}], + ["I_LT_01_cannon_F", 10000, "TANK", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count (milbases + airportsX) > 0}], + ["I_LT_01_AT_F", 11000, "TANK", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count (milbases + airportsX) > 0}], ["I_APC_Wheeled_03_cannon_F", 15000, "APC", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count seaports > 0}], + ["B_Heli_Light_01_F", 7000, "HELI", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count airportsX > 0}], ["B_Heli_Light_01_dynamicLoadout_F", 25000, "HELI", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count airportsX > 0}] ]; ["blackMarketStock", _vehiclesBlackMarket] call _fnc_saveToTemplate; ["variants", [ ["I_APC_Wheeled_03_cannon_F", ["Guerilla_01",1]], - ["I_LT_01_AA_F", ["Indep_Olive",1]] + ["I_LT_01_AA_F", ["Indep_Olive",1]], + ["I_LT_01_scout_F", ["Indep_Olive",1]], + ["I_LT_01_cannon_F", ["Indep_Olive",1]], + ["I_LT_01_AT_F", ["Indep_Olive",1]] ]] call _fnc_saveToTemplate; #include "Vanilla_Reb_Vehicle_Attributes.sqf" diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_SDK.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_SDK.sqf index a7d5ba2652..f1fb7ddec4 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_SDK.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_SDK.sqf @@ -73,14 +73,21 @@ private _shopWs = if (_hasWs) then { private _vehiclesBlackMarket = _shopWs + [ ["I_UAV_01_F", 2000, "UAV", {true}], ["I_LT_01_AA_F", 7500, "AA", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count (milbases + airportsX) > 0}], + ["I_LT_01_scout_F", 7500, "AA", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count (milbases + airportsX) > 0}], + ["I_LT_01_cannon_F", 10000, "TANK", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count (milbases + airportsX) > 0}], + ["I_LT_01_AT_F", 11000, "TANK", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count (milbases + airportsX) > 0}], ["I_APC_Wheeled_03_cannon_F", 15000, "APC", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count seaports > 0}], + ["B_Heli_Light_01_F", 7000, "HELI", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count airportsX > 0}], ["B_Heli_Light_01_dynamicLoadout_F", 25000, "HELI", {{sidesX getVariable [_x,sideUnknown] isEqualTo teamPlayer} count airportsX > 0}] ]; ["blackMarketStock", _vehiclesBlackMarket] call _fnc_saveToTemplate; ["variants", [ ["I_APC_Wheeled_03_cannon_F", ["Guerilla_01",1]], - ["I_LT_01_AA_F", ["Indep_Olive",1]] + ["I_LT_01_AA_F", ["Indep_Olive",1]], + ["I_LT_01_scout_F", ["Indep_Olive",1]], + ["I_LT_01_cannon_F", ["Indep_Olive",1]], + ["I_LT_01_AT_F", ["Indep_Olive",1]] ]] call _fnc_saveToTemplate; #include "Vanilla_Reb_Vehicle_Attributes.sqf" diff --git a/A3A/addons/core/functions/REINF/fn_addBlackMarketVeh.sqf b/A3A/addons/core/functions/REINF/fn_addBlackMarketVeh.sqf index 92d36dcb4c..5e3bd131fa 100644 --- a/A3A/addons/core/functions/REINF/fn_addBlackMarketVeh.sqf +++ b/A3A/addons/core/functions/REINF/fn_addBlackMarketVeh.sqf @@ -47,6 +47,7 @@ private _fnc_placed = { }; [_vehicle, teamPlayer] call A3A_fnc_AIVehInit; + [_vehicle, teamPlayer] call SCRT_fnc_misc_tryInitVehicle; player reveal _vehicle; }; diff --git a/ForkChangelog.md b/ForkChangelog.md index 6ae5f158ef..b02a7d8862 100644 --- a/ForkChangelog.md +++ b/ForkChangelog.md @@ -3,6 +3,7 @@ ## 2.3.1 ### Additions - New civilian plane flyby random event +- (Vanilla, Aegis) Weasel AA, AT, Autocannon, Radar variants will be present in Vehicle Black Market ## 2.3 ### Additions