diff --git a/BC_buyables/factions.hpp b/BC_buyables/factions.hpp index 260689b9..bbff204b 100644 --- a/BC_buyables/factions.hpp +++ b/BC_buyables/factions.hpp @@ -3,7 +3,7 @@ /// BLUFOR #include "factions\bwGM.hpp" #include "factions\usa.hpp" -#include "factions\usaTank.hpp" +#include "factions\bwTank.hpp" /// OPFOR #include "factions\nvaGM.hpp" diff --git a/BC_buyables/factions/bwGM.hpp b/BC_buyables/factions/bwGM.hpp index da2956f3..5aa118cf 100644 --- a/BC_buyables/factions/bwGM.hpp +++ b/BC_buyables/factions/bwGM.hpp @@ -175,9 +175,8 @@ class bwGM { class gm_ge_army_m113a1g_apc_milan_oli { displayName = "Armed carrier (tracked)."; - description = "1 GPS\nFRIES equipped"; + description = ""; stock = 7; - code = "(_this select 0) addItemCargoGlobal ['ACE_NVG_Wide',2];(_this select 0) addItemCargoGlobal ['ItemGPS',1];[(_this select 0)] call ace_fastroping_fnc_equipFRIES;"; spawnEmpty = 1; crewHelmet = "gm_ge_headgear_crewhat_80_blk"; condition = "BC_IS_WOODLAND"; diff --git a/BC_buyables/factions/usaTank.hpp b/BC_buyables/factions/bwTank.hpp similarity index 66% rename from BC_buyables/factions/usaTank.hpp rename to BC_buyables/factions/bwTank.hpp index 733a26dc..d921e80f 100644 --- a/BC_buyables/factions/usaTank.hpp +++ b/BC_buyables/factions/bwTank.hpp @@ -1,7 +1,7 @@ //a different set of buyables -class USATank { +class bwTank { side = "Blufor"; - loadout = "usa"; + loadout = "bwFle"; mode = "destroy"; // needs to be in every faction @@ -9,39 +9,37 @@ class USATank { deployAction = ""; retractAction = ""; 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 { + class gm_ge_army_Leopard1a3a1_wdl { condition = "true"; - code = "[(_this select 0)] call BC_buyables_fnc_configureBluforStartVehicle;"; + code = "[(_this select 0)] call BC_buyables_fnc_configureBluforStartVehicle; (_this select 0) addWeaponCargoGlobal ['rhs_weap_m72a7', 12];"; }; }; class Light { displayName = "Light"; kindOf = "Vehicles"; - maxBuyCount = 1; + maxBuyCount = 3; minPlayerCount = 0; driverGps = "true"; crewHelmet = ""; disableTIEquipment = "true"; - class RHS_M2A3_wd { - displayName = "M2A3"; + class gm_ge_army_m113a1g_apc_milan_wdl { + displayName = "M113 Milan"; description = ""; price = 10; - stock = 1; + stock = 3; itemCargo = ""; - code = "(_this select 0) addWeaponCargoGlobal ['rhs_weap_m72a7', 3];"; + code = "(_this select 0) addWeaponCargoGlobal ['rhs_weap_m72a7', 6];"; magazineCargo = ""; trackCargo = 2; spawnEmpty = 1; condition = "true"; - vehicleInit = "[['standard',1],['IFF_Panels_Hide',1,'Select_TOW',1,'Select_Stinger',0]]"; + vehicleInit = "[[],[]]"; }; }; @@ -50,23 +48,23 @@ class USATank { displayName = "Heavy"; kindOf = "Vehicles"; maxBuyCount = 2; - minPlayerCount = 10; + minPlayerCount = 0; driverGps = "true"; crewHelmet = ""; disableTIEquipment = "true"; - class rhsusf_m1a1aimwd_usarmy { - displayName = "M1A1"; + class gm_ge_army_Leopard1a3a1_wdl { + displayName = "Leopard 1 A3"; description = ""; price = 10; stock = 2; - code = "(_this select 0) addWeaponCargoGlobal ['rhs_weap_m72a7', 3];"; + code = "(_this select 0) addWeaponCargoGlobal ['rhs_weap_m72a7', 6];"; itemCargo = ""; magazineCargo = ""; trackCargo = 2; spawnEmpty = 1; condition = "true"; - vehicleInit = "[['woodland',1],['IFF_Panels_Hide',1,'Miles_Hide',1]]"; + vehicleInit = "[[],[]]"; }; }; @@ -74,20 +72,20 @@ class USATank { class Support { displayName = "Support"; kindOf = "Vehicles"; - maxBuyCount = 1; - minPlayerCount = 20; + maxBuyCount = 2; + minPlayerCount = 0; driverGps = "true"; crewHelmet = ""; disableTIEquipment = "true"; - class rhsusf_m966_w { + class redd_tank_wiesel_1a2_tow { displayName = "HMMWV-TOW"; description = ""; - code = "(_this select 0) addWeaponCargoGlobal ['rhs_weap_m72a7', 3];"; + code = "(_this select 0) addWeaponCargoGlobal ['rhs_weap_m72a7', 6];"; 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]]"; + vehicleInit = "[[],[]]"; }; }; }; \ No newline at end of file diff --git a/BC_buyables/factions/russiaTank.hpp b/BC_buyables/factions/russiaTank.hpp index 04455de6..a6d64c71 100644 --- a/BC_buyables/factions/russiaTank.hpp +++ b/BC_buyables/factions/russiaTank.hpp @@ -15,45 +15,45 @@ class RussiaTank { disableTIEquipment = "true"; canMoveDuringTransmission = "true"; - class rhs_t80bvk { - displayName = "T-80BVK"; + class gm_gc_army_t55a_oli { + displayName = "T-55A"; description = ""; price = 10; stock = 2; 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]]"; - removeMagazines = "['rhs_mag_3of26_5', [0]]"; + vehicleInit = "[['gm_gc_oli',1], ['camoNet_01_unhide',0]]"; + crewHelmet = "gm_gc_army_headgear_crewhat_80_blk"; terminalPositionOffset = "[0.3,-2.85,0.7]"; terminalVectorDirAndUp = "[[0,1,0.3],[0,0,0.7]]"; antennaOffset = "[0,-3.2,-0.1]"; - code = "[(_this select 0)] call BC_buyables_fnc_configureOpforStartVehicle; (_this select 0) addWeaponCargoGlobal ['rhs_weap_rpg26', 3];"; + code = "[(_this select 0)] call BC_buyables_fnc_configureOpforStartVehicle; (_this select 0) addWeaponCargoGlobal ['rhs_weap_rpg26', 12];"; }; }; class Light { displayName = "Light"; kindOf = "Vehicles"; - maxBuyCount = 1; + maxBuyCount = 3; minPlayerCount = 0; driverGps = "true"; crewHelmet = "rhs_tsh4"; disableTIEquipment = "true"; - class rhs_bmp2d_vmf { - displayName = "BMP2-D"; - description = ""; + class gm_gc_army_bmp1sp2_oli { + displayName = "BMP1-D"; + description = "Carries more soldiers than T-55A but is less protected."; price = 10; - stock = 7; + stock = 3; spawnEmpty = 1; condition = "true"; - code = "(_this select 0) addWeaponCargoGlobal ['rhs_weap_rpg26', 3];"; + code = "(_this select 0) addWeaponCargoGlobal ['rhs_weap_rpg26', 6];"; 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]]"; - }; + crewHelmet = "gm_gc_army_headgear_crewhat_80_blk"; + vehicleInit = "[['gm_gc_oli',1],['spareTracks_1_1_unhide',0,'spareTracks_1_2_unhide',0,'spareTracks_2_1_unhide',0,'wheelChock_1_1_unhide',0,'wheelChock_1_2_unhide',0,'woodenBeam_01_unhide',0,'tarpRoll_01_unhide',0]]"; + }; }; @@ -61,21 +61,22 @@ class RussiaTank { displayName = "Heavy"; kindOf = "Vehicles"; maxBuyCount = 2; - minPlayerCount = 10; + minPlayerCount = 0; driverGps = "true"; crewHelmet = "rhs_tsh4"; disableTIEquipment = "true"; - class rhs_t80bvk { - displayName = "T-80BVK"; + class gm_gc_army_t55a_oli { + displayName = "T-55A"; description = ""; price = 10; stock = 2; - code = "(_this select 0) 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]]"; - removeMagazines = "['rhs_mag_3of26_5', [0]]"; + vehicleInit = "[['gm_gc_oli',1], ['camoNet_01_unhide',0]]"; + crewHelmet = "gm_gc_army_headgear_crewhat_80_blk"; + antennaOffset = "[0,-3.2,-0.1]"; + code = "[(_this select 0)] call BC_buyables_fnc_configureOpforStartVehicle; (_this select 0) addWeaponCargoGlobal ['rhs_weap_rpg26', 6];"; }; }; @@ -83,8 +84,8 @@ class RussiaTank { class Support { displayName = "Support"; kindOf = "Vehicles"; - maxBuyCount = 1; - minPlayerCount = 20; + maxBuyCount = 2; + minPlayerCount = 0; driverGps = "true"; crewHelmet = "rhs_tsh4"; disableTIEquipment = "true"; @@ -92,8 +93,8 @@ class RussiaTank { class rhsgref_BRDM2_ATGM_msv { displayName = "BRDM-AT"; description = ""; - stock = 7; - code = "(_this select 0) addWeaponCargoGlobal ['rhs_weap_rpg26', 3];"; + stock = 2; + code = "(_this select 0) addWeaponCargoGlobal ['rhs_weap_rpg26', 6];"; spawnEmpty = 1; condition = "true"; vehicleInit = "[['olive', 1], ['driverViewHatch',0,'commanderViewHatch',0,'hatchCommander',1]]"; diff --git a/BC_buyables/params.hpp b/BC_buyables/params.hpp index b619be04..b3a7cdd3 100644 --- a/BC_buyables/params.hpp +++ b/BC_buyables/params.hpp @@ -2,8 +2,8 @@ class BUYABLES_BLUFOR { title = "Blufor"; values[] = {0, 1, 2}; - texts[] = {"bwGM", "USA", "USATanks"}; - default = 1; + texts[] = {"bwGM", "USA", "BWTanks"}; + default = 2; }; class BUYABLES_OPFOR @@ -11,5 +11,5 @@ class BUYABLES_OPFOR title = "Opfor"; values[] = {0, 1, 2}; texts[] = {"nvaGM", "Russia", "RussiaTanks"}; - default = 1; + default = 2; }; diff --git a/BC_loadouts/factions.hpp b/BC_loadouts/factions.hpp index 8d5009ee..3481338d 100644 --- a/BC_loadouts/factions.hpp +++ b/BC_loadouts/factions.hpp @@ -2,4 +2,6 @@ #include "factions\usa.hpp" #include "factions\bwGM.hpp" -#include "factions\nvaGM.hpp" \ No newline at end of file +#include "factions\nvaGM.hpp" + +#include "factions\bwFle.hpp" \ No newline at end of file diff --git a/BC_loadouts/factions/bwFle.hpp b/BC_loadouts/factions/bwFle.hpp new file mode 100644 index 00000000..43c16991 --- /dev/null +++ b/BC_loadouts/factions/bwFle.hpp @@ -0,0 +1,223 @@ +class bwFle { + class AllUnits { + primaryWeapon = "rhs_weap_hk416d10"; + primaryWeaponMagazine = "rhs_mag_30Rnd_556x45_Mk318_Stanag"; + primaryWeaponPointer = "acc_flashlight"; + primaryWeaponOptics = "rhsusf_acc_eotech_xps3"; + handgunWeapon = "rhsusf_weap_m9"; + handgunWeaponMagazine = "rhsusf_mag_15Rnd_9x19_JHP"; + uniform = "SMM_Uniform_BW_FT"; + vest = "SMM_Vest_BW_FT"; + backpack = "SMM_Kitbag_BW_FT"; + headgear = "SMM_Helmet_A_BW_FT"; + binoculars = "Binocular"; + map = "ItemMap"; + radio = "TFAR_anprc152"; + compass = "ItemCompass"; + watch = "ItemWatch"; + nvgoggles = ""; + }; + + class Type { + class Soldier_F { + gps = ""; + addItemsToUniform[] = { + LIST_7("ACE_fieldDressing"), + LIST_2("ACE_epinephrine"), + LIST_3("ACE_morphine"), + LIST_2("ACE_tourniquet"), + "ACE_MapTools", + "ACE_Flashlight_XL50", + LIST_2("rhsusf_mag_15Rnd_9x19_JHP"), + "ACE_key_west" + }; + addItemsToVest[] = { + LIST_6("rhs_mag_30Rnd_556x45_Mk318_Stanag"), + LIST_2("rhsusf_mag_15Rnd_9x19_JHP"), + LIST_2("rhs_mag_m67"), + LIST_2("SmokeShell") + }; + }; + class Engineer_F: Soldier_F{ + backpack = "rhssaf_kitbag_smb"; + addItemsToBackpack[] = { + "toolkit", + LIST_6("ACE_fieldDressing"), + LIST_2("ACE_epinephrine"), + LIST_2("ACE_morphine"), + "grad_axe", + "ACE_EntrenchingTool", + "ACE_DefusalKit" + }; + }; + class HeavyGunner_F: Soldier_F { + primaryWeapon = "rhs_weap_m240B"; + primaryWeaponMagazine = "rhsusf_100Rnd_762x51_m62_tracer"; + addItemsToUniform[] = { + LIST_5("ACE_fieldDressing"), + LIST_2("ACE_epinephrine"), + LIST_3("ACE_morphine"), + LIST_2("ACE_tourniquet"), + "ACE_MapTools", + "ACE_Flashlight_XL50" + }; + addItemsToVest[] = { + "rhs_mag_m67", + "SmokeShell", + "rhsusf_100Rnd_762x51_m62_tracer", + "rhsusf_50Rnd_762x51" + }; + addItemsToBackpack[] = { + LIST_2("rhsusf_100Rnd_762x51_m62_tracer") + }; + }; + class Soldier_AR_F: Soldier_F { + primaryWeapon = "rhs_weap_m249_pip_S"; + primaryWeaponMagazine = "rhsusf_200rnd_556x45_M855_mixed_box"; + addItemsToUniform[] = { + LIST_5("ACE_fieldDressing"), + LIST_2("ACE_epinephrine"), + LIST_3("ACE_morphine"), + LIST_2("ACE_tourniquet"), + "ACE_MapTools", + "ACE_Flashlight_XL50", + LIST_2("rhsusf_mag_15Rnd_9x19_JHP") + }; + addItemsToVest[] = { + LIST_2("rhsusf_mag_15Rnd_9x19_JHP"), + "rhs_mag_m67", + LIST_2("SmokeShell"), + "rhsusf_200rnd_556x45_M855_mixed_box" + }; + addItemsToBackpack[] = { + LIST_3("rhsusf_200rnd_556x45_M855_mixed_box") + }; + }; + class Soldier_AAR_F: Soldier_F { + addItemsToUniform[] = { + LIST_5("ACE_fieldDressing"), + LIST_2("ACE_epinephrine"), + LIST_3("ACE_morphine"), + LIST_2("ACE_tourniquet"), + "ACE_MapTools", + "ACE_Flashlight_XL50", + LIST_2("rhsusf_mag_15Rnd_9x19_JHP") + }; + addItemsToBackpack[] = { + LIST_2("rhsusf_100Rnd_762x51_m62_tracer") + }; + }; + + class Soldier_A_F: Soldier_F { + addItemsToVest[] = { + LIST_8("rhs_mag_30Rnd_556x45_Mk318_Stanag"), + LIST_2("rhsusf_mag_15Rnd_9x19_JHP"), + LIST_2("rhs_mag_m67"), + LIST_2("SmokeShell") + }; + addItemsToBackpack[] = { + LIST_2("rhsusf_200rnd_556x45_M855_mixed_box") + }; + }; + + // heavy at + class Soldier_AT_F: Soldier_F { + secondaryWeapon = "rhs_weap_maaws"; + secondaryWeaponMagazine = "rhs_mag_maaws_HEAT"; + backpack = "B_Carryall_cbr"; + addItemsToUniform[] = { + LIST_5("ACE_fieldDressing"), + LIST_2("ACE_epinephrine"), + LIST_3("ACE_morphine"), + LIST_2("ACE_tourniquet"), + "ACE_MapTools", + "ACE_Flashlight_XL50" + }; + addItemsToVest[] = { + LIST_3("rhs_mag_30Rnd_556x45_Mk318_Stanag"), + "SmokeShell" + }; + addItemsToBackpack[] = { + "rhs_mag_maaws_HEAT" + }; + }; + + // heavy at ammo carrier + class Soldier_AAT_F: Soldier_F { + addItemsToBackpack[] = { + LIST_6("ACE_fieldDressing"), + LIST_2("ACE_epinephrine"), + LIST_2("ACE_morphine"), + LIST_2("rhs_mag_maaws_HEAT") + }; + }; + + class Soldier_LAT_F: Soldier_F { + secondaryWeapon = "rhs_weap_m72a7"; + addItemsToUniform[] = { + LIST_5("ACE_fieldDressing"), + LIST_2("ACE_epinephrine"), + LIST_3("ACE_morphine"), + LIST_2("ACE_tourniquet"), + "ACE_MapTools", + "ACE_Flashlight_XL50", + LIST_2("rhsusf_mag_15Rnd_9x19_JHP"), + "rhs_m72a7_mag" + }; + }; + + class Medic_F: Soldier_F { + backpack = "SMM_Kitbag_BW_FT"; + addItemsToBackpack[] = { + LIST_10("ACE_fieldDressing"), + LIST_10("ACE_morphine"), + LIST_10("ACE_epinephrine"), + LIST_8("ACE_bloodIV_250"), + LIST_2("HandGrenade") + }; + }; + class Soldier_TL_F: Soldier_F { + gps = "ItemGPS"; + primaryWeapon = "rhs_weap_hk416d10_m320"; + underBarrelMagazine = "1Rnd_Smoke_Grenade_shell"; + addItemsToUniform[] = { + LIST_7("ACE_fieldDressing"), + LIST_2("ACE_epinephrine"), + LIST_4("ACE_morphine"), + LIST_2("ACE_tourniquet"), + "ACE_MapTools", + "ACE_Flashlight_XL50", + LIST_2("rhsusf_mag_15Rnd_9x19_JHP"), + "ACE_key_west" + }; + addItemsToVest[] = { + LIST_2("rhsusf_mag_15Rnd_9x19_JHP"), + LIST_2("rhs_mag_m67"), + LIST_2("SmokeShell"), + LIST_3("rhs_mag_30Rnd_556x45_Mk318_Stanag"), + LIST_5("1Rnd_SmokeGreen_Grenade_shell"), + LIST_5("1Rnd_SmokeRed_Grenade_shell"), + LIST_2("1Rnd_Smoke_Grenade_shell") + }; + addItemsToBackpack[] = { + LIST_5("rhs_mag_30Rnd_556x45_Mk318_Stanag") + }; + }; + class Soldier_SL_F: Soldier_TL_F { + backpack = "TFAR_rt1523g_sage"; + addItemsToUniform[] = { + LIST_7("ACE_fieldDressing"), + LIST_2("ACE_epinephrine"), + LIST_4("ACE_morphine"), + LIST_2("ACE_tourniquet"), + "ACE_MapTools", + "ACE_Flashlight_XL50", + LIST_2("rhsusf_mag_15Rnd_9x19_JHP"), + "ACE_key_west" + }; + }; + class officer_F: Soldier_SL_F {}; + class Crew_F {}; + class Helipilot_F: Crew_F {}; + }; +}; diff --git a/cfgIslands.hpp b/cfgIslands.hpp index b44667a8..d344b1ff 100644 --- a/cfgIslands.hpp +++ b/cfgIslands.hpp @@ -234,6 +234,16 @@ class CfgIslands { }; }; + class hellanmaa { + displayName = "Hellanmaa"; + type = "european"; + isWoodland = true; + spawnPosBlu[] = {-100,-1000,0}; + spawnPosOpf[] = {8284,8104,0}; + previewCamPos[] = {3939,4968,0}; + previewCamTarget[] = {3853,4930,0}; + }; + class lingor3 { displayName = "Lingor"; type = "tropic"; diff --git a/compatibleIslands.txt b/compatibleIslands.txt index 039fd24d..cd7713ea 100644 Binary files a/compatibleIslands.txt and b/compatibleIslands.txt differ diff --git a/grad_tracking/functions/server/fn_radioTruckDeploy.sqf b/grad_tracking/functions/server/fn_radioTruckDeploy.sqf index 75273f0f..504083e7 100644 --- a/grad_tracking/functions/server/fn_radioTruckDeploy.sqf +++ b/grad_tracking/functions/server/fn_radioTruckDeploy.sqf @@ -13,21 +13,27 @@ if (typeOf _radiotruck == "rhs_gaz66_r142_vv") exitWith { _radiotruck setVariable ["GRAD_isAnimating", false, true]; }; +/* _radiotruck setVariable ["GRAD_fuel", _fuel, true]; [_radiotruck, 0] remoteExec ["setFuel", _owner]; +*/ sleep 3; _radiotruck setVariable ["GRAD_isDeployed", true, true]; _radiotruck setVariable ["GRAD_isAnimating", false, true]; _radiotruck setVariable ["tf_range", 50000, true]; // for vehicles other than rhs gaz66 +/* private _antennaOffset = _radiotruck getVariable ["BC_antennaOffset", []]; if (count _antennaOffset > 0) then { private _antenna = "Land_SatelliteAntenna_01_F" createVehicle [0,0,0]; _antenna attachTo [_radiotruck, _antennaOffset]; _radiotruck setVariable ["BC_antennaObj", _antenna, true]; }; +*/ +/* if (_canMove) then { [_radiotruck, _fuel] remoteExec ["setFuel", _owner]; -}; \ No newline at end of file +}; +*/ \ No newline at end of file diff --git a/grad_tracking/functions/server/fn_radioTruckRetract.sqf b/grad_tracking/functions/server/fn_radioTruckRetract.sqf index 6990ca49..02bd7c39 100644 --- a/grad_tracking/functions/server/fn_radioTruckRetract.sqf +++ b/grad_tracking/functions/server/fn_radioTruckRetract.sqf @@ -15,12 +15,16 @@ sleep 3; _radiotruck setVariable ["GRAD_isDeployed", false, true]; _radiotruck setVariable ["GRAD_isAnimating", false, true]; +/* _fuel = _radiotruck getVariable ["GRAD_fuel", 1]; [_radiotruck, _fuel] remoteExec ["setFuel", owner _radiotruck]; +*/ // [_radiotruck, true] remoteExec ["engineOn", owner _radiotruck]; +/* private _antenna = _radiotruck getVariable ["BC_antennaObj", objNull]; if (!isNull _antenna) then { detach _antenna; deleteVehicle _antenna; -}; \ No newline at end of file +}; +*/ \ No newline at end of file diff --git a/slotlist_tanks.xml b/slotlist_tanks.xml new file mode 100644 index 00000000..1ce9ed59 --- /dev/null +++ b/slotlist_tanks.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file