diff --git a/BC_buyables/factions/russiaTank.hpp b/BC_buyables/factions/russiaTank.hpp index 6330e518..84f88277 100644 --- a/BC_buyables/factions/russiaTank.hpp +++ b/BC_buyables/factions/russiaTank.hpp @@ -3,15 +3,16 @@ class RussiaTank { side = "Opfor"; loadout = "russia"; mode = "destroy"; - driverGps = "true"; - crewHelmet = "rhs_tsh4"; - disableTIEquipment = "true"; + // needs to be in every faction class StartVehicle { deployAction = ""; retractAction = ""; condition = "false"; + driverGps = "true"; + crewHelmet = "rhs_tsh4"; + disableTIEquipment = "true"; class rhs_sprut_vdv { condition = "true"; @@ -29,6 +30,9 @@ class RussiaTank { kindOf = "Vehicles"; maxBuyCount = 1; minPlayerCount = 0; + driverGps = "true"; + crewHelmet = "rhs_tsh4"; + disableTIEquipment = "true"; class rhs_bmp2d_vmf { displayName = "BMP2-D"; @@ -37,16 +41,13 @@ class RussiaTank { stock = 7; spawnEmpty = 1; condition = "true"; - itemCargo = "[['itemGPS', 3], ['itemMap',3]]"; + code = "(_this select 2) addWeaponCargoGlobal ['rhs_weap_rpg26', 3];"; + itemCargo = ""; magazineCargo = "[['HandGrenade', 5]]"; trackCargo = 2; removeMagazines = "['rhs_mag_og15v_20', [0]]"; vehicleInit = "[['standard',1], ['crate_l1_unhide',1,'crate_l2_unhide',1,'crate_l3_unhide',1,'crate_r1_unhide',1,'crate_r2_unhide',1,'crate_r3_unhide',1,'wood_1_unhide',1,'maljutka_hide_source',1,'cargoHandler1',0]]"; }; - - class rhs_bmp2k_vmf: rhs_bmp2d_vmf { - displayName = "BMP2-K"; - }; }; @@ -55,12 +56,16 @@ class RussiaTank { kindOf = "Vehicles"; maxBuyCount = 2; minPlayerCount = 10; + driverGps = "true"; + crewHelmet = "rhs_tsh4"; + disableTIEquipment = "true"; class rhs_t80bvk { displayName = "T-80BVK"; description = ""; price = 10; stock = 2; + code = "(_this select 2) addWeaponCargoGlobal ['rhs_weap_rpg26', 3];"; spawnEmpty = 1; condition = "true"; vehicleInit = "[[], ['kshield_unhide',0,'kdeck_unhide',1,'sideskirt_unhide',0,'fbskirt_unhide',0,'ftskirt_unhide',0,'log_unhide',1,'snorkel_unhide',0]]"; @@ -74,11 +79,15 @@ class RussiaTank { kindOf = "Vehicles"; maxBuyCount = 1; minPlayerCount = 20; + driverGps = "true"; + crewHelmet = "rhs_tsh4"; + disableTIEquipment = "true"; class rhsgref_BRDM2_ATGM_msv { displayName = "BRDM-AT"; description = ""; stock = 7; + code = "(_this select 2) addWeaponCargoGlobal ['rhs_weap_rpg26', 3];"; spawnEmpty = 1; condition = "true"; vehicleInit = "[['olive', 1], ['driverViewHatch',0,'commanderViewHatch',0,'hatchCommander',1]]"; diff --git a/BC_buyables/factions/usaTank.hpp b/BC_buyables/factions/usaTank.hpp index 422f5506..5e2959ab 100644 --- a/BC_buyables/factions/usaTank.hpp +++ b/BC_buyables/factions/usaTank.hpp @@ -3,9 +3,6 @@ class USATank { side = "Blufor"; loadout = "usa"; mode = "destroy"; - driverGps = "true"; - crewHelmet = ""; - disableTIEquipment = "true"; // needs to be in every faction class StartVehicle { @@ -14,6 +11,9 @@ class USATank { condition = "false"; terminalPositionOffset = [0.3,-2.85,0.7]; terminalVectorDirAndUp = [[0,1,0.3],[0,0,0.7]]; + driverGps = "true"; + crewHelmet = ""; + disableTIEquipment = "true"; class rhsusf_m1a2sep1wd_usarmy { condition = "true"; @@ -26,6 +26,9 @@ class USATank { kindOf = "Vehicles"; maxBuyCount = 1; minPlayerCount = 0; + driverGps = "true"; + crewHelmet = ""; + disableTIEquipment = "true"; class RHS_M2A3_wd { displayName = "M2A3"; @@ -33,6 +36,7 @@ class USATank { price = 10; stock = 1; itemCargo = ""; + code = "(_this select 2) addWeaponCargoGlobal ['rhs_weap_m72a7', 3];"; magazineCargo = ""; trackCargo = 2; spawnEmpty = 1; @@ -47,12 +51,16 @@ class USATank { kindOf = "Vehicles"; maxBuyCount = 2; minPlayerCount = 10; + driverGps = "true"; + crewHelmet = ""; + disableTIEquipment = "true"; class rhsusf_m1a1aimwd_usarmy { displayName = "M1A1"; description = ""; price = 10; stock = 2; + code = "(_this select 2) addWeaponCargoGlobal ['rhs_weap_m72a7', 3];"; itemCargo = ""; magazineCargo = ""; trackCargo = 2; @@ -68,12 +76,15 @@ class USATank { kindOf = "Vehicles"; maxBuyCount = 1; minPlayerCount = 20; + driverGps = "true"; + crewHelmet = ""; + disableTIEquipment = "true"; class rhsusf_m966_w { displayName = "HMMWV-TOW"; description = ""; - stock = 7; - code = ""; + code = "(_this select 2) addWeaponCargoGlobal ['rhs_weap_m72a7', 3];"; + stock = 2; spawnEmpty = 1; condition = "true"; vehicleInit = "[[standard,1], [hide_snorkel,1,hide_CIP,0,hide_BFT,0,hide_Antenna,0,hide_A2_Parts,0,Hide_A2Bumper,1,Hide_Brushguard,1]]"; diff --git a/BC_buymenu/functions/fn_buyVehicle.sqf b/BC_buymenu/functions/fn_buyVehicle.sqf index 70fb4be2..b978bfe9 100644 --- a/BC_buymenu/functions/fn_buyVehicle.sqf +++ b/BC_buymenu/functions/fn_buyVehicle.sqf @@ -5,7 +5,7 @@ params ["_buyer","_account","_price","_code","_baseConfigName","_categoryConfigName","_itemConfigName","_spawnPosition", "_spawnDir", "_driverGPS", "_crew", "_crewHelmet", "_disableTIEquipment", "_itemCargo", "_magazineCargo", "_trackCargo", "_wheelCargo", "_removeMagazines"]; -diag_log format ["%1 - %2 - %3", _driverGPS, _categoryConfigName, _itemConfigName]; +diag_log format ["%1 - %2 - %3", _crewHelmet, _crew, _removeMagazines]; private _spawnEmpty = [(missionConfigFile >> "CfgGradBuymenu" >> _baseConfigName >> _categoryConfigName >> _itemConfigName >> "spawnEmpty"), "number", -1] call CBA_fnc_getConfigEntry; if (_spawnEmpty == -1) then {