Skip to content
This repository has been archived by the owner on Aug 29, 2023. It is now read-only.

Commit

Permalink
hotfix finale
Browse files Browse the repository at this point in the history
  • Loading branch information
@igorkis-scrts
igorkis-scrts committed Aug 27, 2023
1 parent cf50a92 commit e12bf11
Show file tree
Hide file tree
Showing 8 changed files with 51 additions and 4 deletions.
8 changes: 8 additions & 0 deletions A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_FIA.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
10 changes: 9 additions & 1 deletion A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_LM.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
8 changes: 8 additions & 0 deletions A3A/addons/core/Templates/Templates/Aegis/Aegis_Reb_SDK.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
9 changes: 8 additions & 1 deletion A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_FIA.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
9 changes: 8 additions & 1 deletion A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_LL.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
9 changes: 8 additions & 1 deletion A3A/addons/core/Templates/Templates/Vanilla/Vanilla_Reb_SDK.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions A3A/addons/core/functions/REINF/fn_addBlackMarketVeh.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ private _fnc_placed = {
};

[_vehicle, teamPlayer] call A3A_fnc_AIVehInit;
[_vehicle, teamPlayer] call SCRT_fnc_misc_tryInitVehicle;

player reveal _vehicle;
};
Expand Down
1 change: 1 addition & 0 deletions ForkChangelog.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e12bf11

Please sign in to comment.