diff --git a/addons/homebase/src/client/fn_Base_Client_VegetationHider_InitEH.sqf b/addons/homebase/src/client/fn_Base_Client_VegetationHider_InitEH.sqf
index 804fb822c5504ec4506b2030d5cf4a502479dd16..82fa4fc26d1f69616947cf85d678879cf73f1755 100644
--- a/addons/homebase/src/client/fn_Base_Client_VegetationHider_InitEH.sqf
+++ b/addons/homebase/src/client/fn_Base_Client_VegetationHider_InitEH.sqf
@@ -10,13 +10,7 @@ if !assert(!isNull _hider) exitWith {};
GM_DEBUG1("initializing %1", _hider);
-private _hide = true;
-
-if (!isNil "EPOCH_buildMode") then {
- _hide = (EPOCH_buildMode == 0);
-};
-
-_hider hideObject _hide;
-[_hider, _hide] call GM_FN(Base_Client_VegetationHider_HideObjects, SRC_BASE_CLIENT);
+_hider hideObject true;
+[_hider, true] call GM_FN(Base_Client_VegetationHider_HideObjects, SRC_BASE_CLIENT);
nil;
diff --git a/addons/lootspawner/include/loot/buildings.hpp b/addons/lootspawner/include/loot/buildings.hpp
index 4eb83907f662b054265b3e162e5c436e2431c0ce..9a2ea136c6820cde486c36fca7fcbf98bc491bb2 100644
--- a/addons/lootspawner/include/loot/buildings.hpp
+++ b/addons/lootspawner/include/loot/buildings.hpp
@@ -12,17 +12,17 @@ class Buildings {
/* Commented out classes are _known_ to have no building positions.
* They're just included here so I don't always readd them and then see errors in RPTs. */
classes[] = {
- "Land_Afbarabizna",
- "Land_Airport_02_Terminal_F",
- "Land_Airport_left_F",
- "Land_Airport_right_F",
"Land_A_BuildingWIP",
"Land_A_GeneralStore_01",
"Land_A_GeneralStore_01a",
"Land_A_Office01",
"Land_A_Pub_01",
"Land_A_Pub_01",
- "Land_a_stationhouse",
+ "Land_Addon_04_F",
+ "Land_Afbarabizna",
+ "Land_Airport_02_Terminal_F",
+ "Land_Airport_left_F",
+ "Land_Airport_right_F",
"Land_Barn_01_brown_F",
"Land_Barn_01_grey_F",
"Land_Barn_02_F",
@@ -30,18 +30,16 @@ class Buildings {
"Land_Barn_03_small_F",
"Land_Barn_04_F",
"Land_Barn_W_01",
- "Land_boden_500_500_025_clean_cnc",
"Land_Busstop",
"Land_Camp_House_01_brown_F",
"Land_Caravan_01_green_F",
"Land_Caravan_01_rust_F",
- "Land_cargo_house_slum_F",
"Land_Chapel_01_F",
"Land_Chapel_01_white_F",
"Land_Chapel_02_white_F",
"Land_Chapel_02_white_damaged_F",
- "Land_Chapel_02_yellow_damaged_F",
"Land_Chapel_02_yellow_F",
+ "Land_Chapel_02_yellow_damaged_F",
"Land_Chapel_Small_V1_F",
"Land_Chapel_Small_V2_F",
"Land_Chapel_V1_F",
@@ -51,60 +49,40 @@ class Buildings {
"Land_Church_01_V2_F",
"Land_Church_02_F",
"Land_Church_03_F",
- "Land_Church_04_damaged_F",
"Land_Church_04_F",
- "Land_Church_04_lightblue_damaged_F",
+ "Land_Church_04_damaged_F",
"Land_Church_04_lightblue_F",
- "Land_Church_04_lightyellow_damaged_F",
+ "Land_Church_04_lightblue_damaged_F",
"Land_Church_04_lightyellow_F",
- "Land_Church_04_red_damaged_F",
+ "Land_Church_04_lightyellow_damaged_F",
"Land_Church_04_red_F",
- "Land_Church_04_small_damaged_F",
+ "Land_Church_04_red_damaged_F",
"Land_Church_04_small_F",
- "Land_Church_04_small_lightblue_damaged_F",
+ "Land_Church_04_small_damaged_F",
"Land_Church_04_small_lightblue_F",
- "Land_Church_04_small_lightyellow_damaged_F",
+ "Land_Church_04_small_lightblue_damaged_F",
"Land_Church_04_small_lightyellow_F",
- "Land_Church_04_small_red_damaged_F",
+ "Land_Church_04_small_lightyellow_damaged_F",
"Land_Church_04_small_red_F",
- "Land_Church_04_small_white_damaged_F",
+ "Land_Church_04_small_red_damaged_F",
"Land_Church_04_small_white_F",
- "Land_Church_04_small_white_red_damaged_F",
+ "Land_Church_04_small_white_damaged_F",
"Land_Church_04_small_white_red_F",
- "Land_Church_04_small_yellow_damaged_F",
+ "Land_Church_04_small_white_red_damaged_F",
"Land_Church_04_small_yellow_F",
- "Land_Church_04_white_damaged_F",
+ "Land_Church_04_small_yellow_damaged_F",
"Land_Church_04_white_F",
- "Land_Church_04_white_red_damaged_F",
+ "Land_Church_04_white_damaged_F",
"Land_Church_04_white_red_F",
- "Land_Church_04_yellow_damaged_F",
+ "Land_Church_04_white_red_damaged_F",
"Land_Church_04_yellow_F",
+ "Land_Church_04_yellow_damaged_F",
"Land_Church_05_F",
"Land_Cihlovej_Dum_mini",
"Land_Cowshed_01_A_F",
"Land_Cowshed_01_B_F",
"Land_Cowshed_01_C_F",
"Land_Crane_F",
- "Land_deox_House_A1",
- "Land_deox_House_A2",
- "Land_deox_House_B1",
- "Land_deox_House_B2",
- "Land_deox_House_C1",
- "Land_deox_House_C2",
- "Land_deox_House_D_M1",
- "Land_deox_House_D_L1",
- "Land_deox_House_D_R1",
- "Land_deox_House_D_M2",
- "Land_deox_House_D_L2",
- "Land_deox_House_D_R2",
- "Land_deox_House_D_M3",
- "Land_deox_House_D_L3",
- "Land_deox_House_D_R3",
- "Land_deox_House_D_M4",
- "Land_deox_House_D_L4",
- "Land_deox_House_D_R4",
- "Land_deox_House_D_medium1_2",
- "Land_deox_House_D_medium3_4",
"Land_Deutshe_mini",
"Land_Dum_istan3_hromada2",
"Land_Dum_istan3_pumpa",
@@ -112,21 +90,19 @@ class Buildings {
"Land_Dum_mesto_in",
"Land_Dum_olezlina",
"Land_Dum_rasovna",
- "Land_d_House_Small_02_V1_F",
- "Land_d_Stone_Shed_V1_F",
- "Land_d_Windmill01_F",
"Land_FeedShack_01_F",
"Land_FireEscape_01_tall_F",
"Land_FuelStation_01_shop_F",
"Land_FuelStation_03_shop_F",
"Land_FuelStation_Build_F",
"Land_FuelStation_Shed_F",
+ "Land_GH_House_2_F",
"Land_GarageShelter_01_F",
"Land_Garaz_bez_tanku",
"Land_Garaz_mala",
"Land_Hangar_2",
- "Land_Hlidac_budka",
"Land_HealthCenter_01_F",
+ "Land_Hlidac_budka",
"Land_Hospital_main_F",
"Land_Hospital_side1_F",
"Land_Hospital_side2_F",
@@ -148,20 +124,6 @@ class Buildings {
"Land_HouseV_1L1",
"Land_HouseV_1L2",
"Land_HouseV_2L",
- "Land_houseV_2T1",
- "Land_House_Big_01_F",
- "Land_House_Big_04_F",
- "Land_House_C_10_EP1",
- "Land_House_C_11_EP1",
- "Land_House_C_12_EP1",
- "Land_House_C_1_EP1",
- "Land_House_C_1_v2_EP1",
- "Land_House_C_2_EP1",
- "Land_House_C_4_EP1",
- "Land_House_C_5_EP1",
- "Land_House_C_5_V1_EP1",
- "Land_House_C_5_V2_EP1",
- "Land_House_C_5_V3_EP1",
"Land_House_1B01_F",
"Land_House_1W01_F",
"Land_House_1W02_F",
@@ -186,8 +148,21 @@ class Buildings {
"Land_House_2W04_F",
"Land_House_2W05_F",
"Land_House_Big_01_F",
+ "Land_House_Big_01_F",
"Land_House_Big_02_F",
"Land_House_Big_03_F",
+ "Land_House_Big_04_F",
+ "Land_House_C_10_EP1",
+ "Land_House_C_11_EP1",
+ "Land_House_C_12_EP1",
+ "Land_House_C_1_EP1",
+ "Land_House_C_1_v2_EP1",
+ "Land_House_C_2_EP1",
+ "Land_House_C_4_EP1",
+ "Land_House_C_5_EP1",
+ "Land_House_C_5_V1_EP1",
+ "Land_House_C_5_V2_EP1",
+ "Land_House_C_5_V3_EP1",
"Land_House_K_7_EP1",
"Land_House_Native_01_F",
"Land_House_Native_02_F",
@@ -203,112 +178,51 @@ class Buildings {
"Land_Hut06",
"Land_Hut06",
"Land_Hut_old02",
- "Land_i_Addon_02_V1_F",
- "Land_i_Addon_03mid_V1_F",
- "Land_i_Addon_03_V1_F",
- "Land_i_Addon_04_V1_F",
- "Land_i_Garage_V1_F",
- "Land_i_Garage_V2_F",
- "Land_i_House_Big_01_b_brown_F",
- "Land_i_House_Big_01_b_white_F",
- "Land_i_House_Big_01_V1_dam_F",
- "Land_i_House_Big_01_V1_F",
- "Land_i_House_Big_01_V2_F",
- "Land_i_House_Big_01_V3_F",
- "Land_i_House_Big_02_b_blue_F",
- "Land_i_House_Big_02_b_brown_F",
- "Land_i_House_Big_02_b_whiteblue_F",
- "Land_i_House_Big_02_b_white_F",
- "Land_i_House_Big_02_V1_dam_F",
- "Land_i_House_Big_02_V1_F",
- "Land_i_House_Big_02_V2_F",
- "Land_i_House_Big_02_V3_F",
- "Land_i_House_Small_01_V1_dam_F",
- "Land_i_House_Small_01_V1_F",
- "Land_i_House_Small_01_V2_dam_F",
- "Land_i_House_Small_01_V2_F",
- "Land_i_House_Small_01_V3_F",
- "Land_i_House_Small_02_b_blue_F",
- "Land_i_House_Small_02_c_white_F",
- "Land_i_House_Small_02_V1_dam_F",
- "Land_i_House_Small_02_V1_F",
- "Land_i_House_Small_02_V2_F",
- "Land_i_House_Small_02_V3_F",
- "Land_i_House_Small_03_V1_dam_F",
- "Land_i_House_Small_03_V1_F",
- "Land_i_Shop_01_V1_dam_F",
- "Land_i_Shop_01_V1_F",
- "Land_i_Shop_01_V2_F",
- "Land_i_Shop_01_V3_F",
- "Land_i_Shop_02_b_white_F",
- "Land_i_Shop_02_b_whiteblue_F",
- "Land_i_Shop_02_b_yellow_F",
- "Land_i_Shop_02_V1_dam_F",
- "Land_i_Shop_02_V1_F",
- "Land_i_Shop_02_V2_F",
- "Land_i_Shop_02_V3_F",
- "Land_i_Stone_HouseBig_V1_dam_F",
- "Land_i_Stone_HouseBig_V1_F",
- "Land_i_Stone_HouseBig_V2_F",
- "Land_i_Stone_HouseBig_V3_F",
- "Land_i_Stone_HouseSmall_V1_dam_F",
- "Land_i_Stone_HouseSmall_V1_F",
- "Land_i_Stone_HouseSmall_V2_F",
- "Land_i_Stone_HouseSmall_V3_F",
- "Land_i_Stone_Shed_V1_dam_F",
- "Land_i_Stone_Shed_V1_F",
- "Land_i_Stone_Shed_V2_F",
- "Land_i_Stone_Shed_V3_F",
- "Land_i_Windmill01_F",
"Land_Kostel_trosky",
"Land_Kulna",
- "Land_largescrapper",
"Land_LightHouse_F",
"Land_Lighthouse_small_F",
- "Land_MBG_FlatOne_W",
- "Land_MBG_FlatOne_Y",
- "Land_MBG_FlatOne_R",
+ "Land_MBG_ATC_Base",
+ "Land_MBG_ATC_Segment",
+ "Land_MBG_ATC_Tower",
+ "Land_MBG_ApartmentsOne_G",
"Land_MBG_ApartmentsOne_W",
"Land_MBG_ApartmentsOne_Y",
- "Land_MBG_ApartmentsOne_G",
- "Land_MBG_ApartmentsTwo_P",
"Land_MBG_ApartmentsTwo_B",
"Land_MBG_ApartmentsTwo_G",
- "Land_MBG_Shanty_BIG",
- "Land_MBG_Police_Station",
- "Land_MBG_Radiotelescope",
- "Land_MBG_Killhouse_1",
- "Land_MBG_Killhouse_2",
- "Land_MBG_Killhouse_3",
- "Land_MBG_Killhouse_4",
- "Land_MBG_Killhouse_5",
- "Land_MBG_Warehouse",
- "Land_MBG_Shoothouse_1",
+ "Land_MBG_ApartmentsTwo_P",
+ "Land_MBG_Beach_Chair_1",
+ "Land_MBG_Beach_Chair_2",
+ "Land_MBG_Beach_Chair_3",
+ "Land_MBG_Cinderwall_2p5",
"Land_MBG_Cinderwall_5",
"Land_MBG_Cinderwall_5_Corner",
- "Land_MBG_Cinderwall_Corner",
- "Land_MBG_Cinderwall_2p5",
- "Land_MBG_Cinderwall_5dam",
- "Land_MBG_Cinderwall_5_WoodDoor",
- "Land_MBG_Cinderwall_5_SteelDoor",
"Land_MBG_Cinderwall_5_Gate",
- "Land_MBG_Woodplanks",
"Land_MBG_Cinderwall_5_Ruins",
+ "Land_MBG_Cinderwall_5_SteelDoor",
+ "Land_MBG_Cinderwall_5_WoodDoor",
+ "Land_MBG_Cinderwall_5dam",
+ "Land_MBG_Cinderwall_Corner",
+ "Land_MBG_EdgeLight_Blue",
+ "Land_MBG_EdgeLight_Green",
+ "Land_MBG_EdgeLight_White",
+ "Land_MBG_FlatOne_R",
+ "Land_MBG_FlatOne_W",
+ "Land_MBG_FlatOne_Y",
+ "Land_MBG_GER_ESTATE_1",
+ "Land_MBG_GER_ESTATE_2",
"Land_MBG_GER_HUS_1",
"Land_MBG_GER_HUS_2",
"Land_MBG_GER_HUS_3",
"Land_MBG_GER_HUS_4",
+ "Land_MBG_GER_PUB_1",
+ "Land_MBG_GER_PUB_2",
+ "Land_MBG_GER_PUB_RUINS",
"Land_MBG_GER_RHUS_1",
"Land_MBG_GER_RHUS_2",
"Land_MBG_GER_RHUS_3",
"Land_MBG_GER_RHUS_4",
"Land_MBG_GER_RHUS_5",
- "Land_MBG_GER_ESTATE_1",
- "Land_MBG_GER_ESTATE_2",
- "Land_MBG_Beach_Chair_1",
- "Land_MBG_Beach_Chair_2",
- "Land_MBG_Beach_Chair_3",
- "Land_MBG_Outdoortable",
"Land_MBG_GER_SUPERMARKET_1",
"Land_MBG_GER_SUPERMARKET_2",
"Land_MBG_GER_SUPERMARKET_3",
@@ -317,22 +231,25 @@ class Buildings {
"Land_MBG_Garage_Single_B",
"Land_MBG_Garage_Single_C",
"Land_MBG_Garage_Single_D",
- "Land_MBG_GER_PUB_RUINS",
- "Land_MBG_GER_PUB_1",
- "Land_MBG_GER_PUB_2",
"Land_MBG_HeavyShelter",
- "Land_MBG_ATC_Segment",
- "Land_MBG_ATC_Tower",
- "Land_MBG_ATC_Base",
- "Land_MBG_NavigLight_Red",
- "Land_MBG_EdgeLight_Blue",
- "Land_MBG_EdgeLight_White",
- "Land_MBG_EdgeLight_Green",
- "Land_MBG_MiddleLight_Green",
+ "Land_MBG_Killhouse_1",
+ "Land_MBG_Killhouse_2",
+ "Land_MBG_Killhouse_3",
+ "Land_MBG_Killhouse_4",
+ "Land_MBG_Killhouse_5",
"Land_MBG_MiddleLight_Blue",
- "Land_MBG_MiddleLight_White",
+ "Land_MBG_MiddleLight_Green",
"Land_MBG_MiddleLight_Red",
+ "Land_MBG_MiddleLight_White",
"Land_MBG_MiddleLight_Yellow",
+ "Land_MBG_NavigLight_Red",
+ "Land_MBG_Outdoortable",
+ "Land_MBG_Police_Station",
+ "Land_MBG_Radiotelescope",
+ "Land_MBG_Shanty_BIG",
+ "Land_MBG_Shoothouse_1",
+ "Land_MBG_Warehouse",
+ "Land_MBG_Woodplanks",
"Land_Offices_01_V1_F",
"Land_Panelak",
"Land_Panelak2",
@@ -342,17 +259,16 @@ class Buildings {
"Land_PierWooden_01_hut_F",
"Land_PierWooden_01_platform_F",
"Land_Posed2",
- "Land_Ryb_domek",
"Land_R_HouseV2_01A",
+ "Land_Ryb_domek",
"Land_Sara_domek_sedy",
"Land_Sara_domek_zluty",
"Land_Sara_stodola",
"Land_School_01_F",
- "Land_seveneleven",
- //"Land_Shed_01_F",
+ //"Land_Shed_01_F", // ignore
"Land_Shed_02_F",
"Land_Shed_03_F",
- //"Land_Shed_04_F",
+ //"Land_Shed_04_F", // ignore
"Land_Shed_05_F",
"Land_Shed_08_grey_F",
"Land_Shed_09_F",
@@ -364,7 +280,7 @@ class Buildings {
"Land_Shed_W03",
"Land_Shop_City_01_F",
"Land_Shop_City_02_F",
- //"Land_Shop_City_03_F",
+ //"Land_Shop_City_03_F", // ignore
"Land_Shop_City_04_F",
"Land_Shop_City_05_F",
"Land_Shop_City_06_F",
@@ -372,31 +288,171 @@ class Buildings {
"Land_Shop_Town_01_F",
"Land_Shop_Town_02_F",
"Land_Shop_Town_03_F",
- //"Land_Shop_Town_04_F",
+ //"Land_Shop_Town_04_F", // ignore
"Land_Shop_Town_05_F",
"Land_Slum_01_F",
"Land_Slum_02_F",
- //"Land_Slum_04_F",
- //"Land_Slum_05_F",
+ //"Land_Slum_04_F", // ignore
+ //"Land_Slum_05_F", // ignore
"Land_Slum_House01_F",
"Land_Slum_House02_F",
"Land_Slum_House03_F",
"Land_Stodola_old_open",
"Land_Stodola_open",
"Land_Supermarket_01_F",
+ "Land_VillageStore_01_F",
+ "Land_Warehouse_03_F",
+ "Land_a_stationhouse",
+ "Land_boden_500_500_025_clean_cnc",
+ "Land_cargo_house_slum_F",
+ "Land_d_House_Big_01_V1_F",
+ "Land_d_House_Big_02_V1_F",
+ "Land_d_House_Small_01_V1_F",
+ "Land_d_House_Small_02_V1_F",
+ "Land_d_Stone_HouseSmall_V1_F",
+ "Land_d_Stone_Shed_V1_F",
+ "Land_d_Windmill01_F",
+ "Land_deox_House_A1",
+ "Land_deox_House_A2",
+ "Land_deox_House_B1",
+ "Land_deox_House_B2",
+ "Land_deox_House_C1",
+ "Land_deox_House_C2",
+ "Land_deox_House_D_L1",
+ "Land_deox_House_D_L2",
+ "Land_deox_House_D_L3",
+ "Land_deox_House_D_L4",
+ "Land_deox_House_D_M1",
+ "Land_deox_House_D_M2",
+ "Land_deox_House_D_M3",
+ "Land_deox_House_D_M4",
+ "Land_deox_House_D_R1",
+ "Land_deox_House_D_R2",
+ "Land_deox_House_D_R3",
+ "Land_deox_House_D_R4",
+ "Land_deox_House_D_medium1_2",
+ "Land_deox_House_D_medium3_4",
+ "Land_houseV_2T1",
+ "Land_i_Addon_02_V1_F",
+ "Land_i_Addon_02_b_white_F",
+ "Land_i_Addon_03_V1_F",
+ "Land_i_Addon_03mid_V1_F",
+ "Land_i_Addon_04_V1_F",
+ "Land_i_Garage_V1_F",
+ "Land_i_Garage_V2_F",
+ "Land_i_House_Big_01_V1_F",
+ "Land_i_House_Big_01_V1_dam_F",
+ "Land_i_House_Big_01_V2_F",
+ "Land_i_House_Big_01_V3_F",
+ "Land_i_House_Big_01_b_blue_F",
+ "Land_i_House_Big_01_b_blue_F",
+ "Land_i_House_Big_01_b_brown_F",
+ "Land_i_House_Big_01_b_pink_F",
+ "Land_i_House_Big_01_b_pink_F",
+ "Land_i_House_Big_01_b_white_F",
+ "Land_i_House_Big_01_b_whiteblue_F",
+ "Land_i_House_Big_01_b_whiteblue_F",
+ "Land_i_House_Big_01_b_yellow_F",
+ "Land_i_House_Big_02_V1_F",
+ "Land_i_House_Big_02_V1_dam_F",
+ "Land_i_House_Big_02_V2_F",
+ "Land_i_House_Big_02_V3_F",
+ "Land_i_House_Big_02_b_blue_F",
+ "Land_i_House_Big_02_b_brown_F",
+ "Land_i_House_Big_02_b_pink_F",
+ "Land_i_House_Big_02_b_pink_F",
+ "Land_i_House_Big_02_b_white_F",
+ "Land_i_House_Big_02_b_whiteblue_F",
+ "Land_i_House_Big_02_b_yellow_F",
+ "Land_i_House_Big_02_b_yellow_F",
+ "Land_i_House_Small_01_V1_F",
+ "Land_i_House_Small_01_V1_dam_F",
+ "Land_i_House_Small_01_V2_F",
+ "Land_i_House_Small_01_V2_dam_F",
+ "Land_i_House_Small_01_V3_F",
+ "Land_i_House_Small_01_b_blue_F",
+ "Land_i_House_Small_01_b_blue_F",
+ "Land_i_House_Small_01_b_brown_F",
+ "Land_i_House_Small_01_b_pink_F",
+ "Land_i_House_Small_01_b_pink_F",
+ "Land_i_House_Small_01_b_white_F",
+ "Land_i_House_Small_01_b_white_F",
+ "Land_i_House_Small_01_b_whiteblue_F",
+ "Land_i_House_Small_01_b_whiteblue_F",
+ "Land_i_House_Small_01_b_yellow_F",
+ "Land_i_House_Small_01_b_yellow_F",
+ "Land_i_House_Small_02_V1_F",
+ "Land_i_House_Small_02_V1_dam_F",
+ "Land_i_House_Small_02_V2_F",
+ "Land_i_House_Small_02_V3_F",
+ "Land_i_House_Small_02_b_blue_F",
+ "Land_i_House_Small_02_b_blue_F",
+ "Land_i_House_Small_02_b_brown_F",
+ "Land_i_House_Small_02_b_pink_F",
+ "Land_i_House_Small_02_b_white_F",
+ "Land_i_House_Small_02_b_white_F",
+ "Land_i_House_Small_02_b_whiteblue_F",
+ "Land_i_House_Small_02_b_yellow_F",
+ "Land_i_House_Small_02_b_yellow_F",
+ "Land_i_House_Small_02_c_blue_F",
+ "Land_i_House_Small_02_c_brown_F",
+ "Land_i_House_Small_02_c_pink_F",
+ "Land_i_House_Small_02_c_white_F",
+ "Land_i_House_Small_02_c_white_F",
+ "Land_i_House_Small_02_c_whiteblue_F",
+ "Land_i_House_Small_02_c_yellow_F",
+ "Land_i_House_Small_03_V1_F",
+ "Land_i_House_Small_03_V1_dam_F",
+ "Land_i_Shop_01_V1_F",
+ "Land_i_Shop_01_V1_dam_F",
+ "Land_i_Shop_01_V2_F",
+ "Land_i_Shop_01_V3_F",
+ "Land_i_Shop_02_V1_F",
+ "Land_i_Shop_02_V1_dam_F",
+ "Land_i_Shop_02_V2_F",
+ "Land_i_Shop_02_V3_F",
+ "Land_i_Shop_02_b_blue_F",
+ "Land_i_Shop_02_b_blue_F",
+ "Land_i_Shop_02_b_brown_F",
+ "Land_i_Shop_02_b_brown_F",
+ "Land_i_Shop_02_b_pink_F",
+ "Land_i_Shop_02_b_white_F",
+ "Land_i_Shop_02_b_white_F",
+ "Land_i_Shop_02_b_whiteblue_F",
+ "Land_i_Shop_02_b_whiteblue_F",
+ "Land_i_Shop_02_b_yellow_F",
+ "Land_i_Stone_HouseBig_V1_F",
+ "Land_i_Stone_HouseBig_V1_dam_F",
+ "Land_i_Stone_HouseBig_V2_F",
+ "Land_i_Stone_HouseBig_V3_F",
+ "Land_i_Stone_HouseSmall_V1_F",
+ "Land_i_Stone_HouseSmall_V1_dam_F",
+ "Land_i_Stone_HouseSmall_V2_F",
+ "Land_i_Stone_HouseSmall_V3_F",
+ "Land_i_Stone_House_Big_01_b_clay_F",
+ "Land_i_Stone_Shed_01_b_clay_F",
+ "Land_i_Stone_Shed_01_b_raw_F",
+ "Land_i_Stone_Shed_01_b_white_F",
+ "Land_i_Stone_Shed_01_c_clay_F",
+ "Land_i_Stone_Shed_01_c_white_F",
+ "Land_i_Stone_Shed_V1_F",
+ "Land_i_Stone_Shed_V1_dam_F",
+ "Land_i_Stone_Shed_V2_F",
+ "Land_i_Stone_Shed_V3_F",
+ "Land_i_Windmill01_F",
+ "Land_largescrapper",
+ "Land_seveneleven",
"Land_tavern",
"Land_u_Addon_01_V1_F",
"Land_u_Addon_02_V1_F",
"Land_u_House_Big_01_V1_F",
"Land_u_House_Big_02_V1_F",
- "Land_u_House_Small_01_V1_dam_F",
"Land_u_House_Small_01_V1_F",
- "Land_u_House_Small_02_V1_dam_F",
+ "Land_u_House_Small_01_V1_dam_F",
"Land_u_House_Small_02_V1_F",
+ "Land_u_House_Small_02_V1_dam_F",
"Land_u_Shop_01_V1_F",
- "Land_u_Shop_02_V1_F",
- "Land_VillageStore_01_F",
- "Land_Warehouse_03_F"
+ "Land_u_Shop_02_V1_F"
};
class Edaly_Map_Alpha {
@@ -452,7 +508,8 @@ class Buildings {
"Land_HouseRuin_Big_02_F",
"Land_HouseRuin_Big_02_half_F",
"Land_HouseRuin_Big_03_F",
- "Land_HouseRuin_Big_03_half_F"
+ "Land_HouseRuin_Big_03_half_F",
+ "Land_HouseV_1I4"
};
};
@@ -642,49 +699,31 @@ class Buildings {
};
};
- class Malden {
+ class Gulfcoast {
classes[] = {
- "Land_d_House_Big_01_V1_F",
- "Land_d_House_Big_02_V1_F",
- "Land_d_House_Small_01_V1_F",
- "Land_d_Stone_HouseSmall_V1_F",
- "Land_GH_House_2_F",
- "Land_i_Addon_02_b_white_F",
- "Land_i_House_Big_01_b_blue_F",
- "Land_i_House_Big_01_b_pink_F",
- "Land_i_House_Big_01_b_yellow_F",
- "Land_i_House_Big_01_b_whiteblue_F",
- "Land_i_House_Big_02_b_pink_F",
- "Land_i_House_Big_02_b_yellow_F",
- "Land_i_House_Small_01_b_blue_F",
- "Land_i_House_Small_01_b_brown_F",
- "Land_i_House_Small_01_b_pink_F",
- "Land_i_House_Small_01_b_white_F",
- "Land_i_House_Small_01_b_whiteblue_F",
- "Land_i_House_Small_01_b_yellow_F",
- "Land_i_House_Small_02_b_blue_F",
- "Land_i_House_Small_02_b_brown_F",
- "Land_i_House_Small_02_b_pink_F",
- "Land_i_House_Small_02_b_white_F",
- "Land_i_House_Small_02_b_whiteblue_F",
- "Land_i_House_Small_02_b_yellow_F",
- "Land_i_House_Small_02_c_blue_F",
- "Land_i_House_Small_02_c_brown_F",
- "Land_i_House_Small_02_c_pink_F",
- "Land_i_House_Small_02_c_white_F",
- "Land_i_House_Small_02_c_whiteblue_F",
- "Land_i_House_Small_02_c_yellow_F",
- "Land_i_Shop_02_b_blue_F",
- "Land_i_Shop_02_b_brown_F",
- "Land_i_Shop_02_b_pink_F",
- "Land_i_Shop_02_b_white_F",
- "Land_i_Shop_02_b_whiteblue_F",
- "Land_i_Stone_House_Big_01_b_clay_F",
- "Land_i_Stone_Shed_01_b_clay_F",
- "Land_i_Stone_Shed_01_b_raw_F",
- "Land_i_Stone_Shed_01_b_white_F",
- "Land_i_Stone_Shed_01_c_clay_F",
- "Land_i_Stone_Shed_01_c_white_F"
+ "Land_2Story_Tower",
+ "Land_4Story_Tower",
+ "Land_7Story_Tower",
+ "Land_em_building_01",
+ "Land_em_building_02",
+ "Land_em_building_03",
+ "Land_em_building_04",
+ "Land_em_building_05",
+ "Land_em_mansion_01",
+ "Land_em_mansion_01_reversed",
+ "Land_OrthodoxChurch_02_F",
+ "Land_Trailor_1",
+ "Land_Trailor_2",
+ "Land_Trailor_3",
+ "Land_Trailor_4",
+ "Land_Trailor_5",
+ "Land_Trailor_6",
+ "Land_Trailor_7",
+ "Land_Trailor_8",
+ "Land_Trailor_9",
+ "Land_Trailor_10",
+ "Land_Trailor_11",
+ "Land_Trailor_12_1"
};
};
};
@@ -715,6 +754,10 @@ class Buildings {
"Land_Barracks_06_F",
"Land_Budova4",
"Land_Budova4_in",
+ "Land_Bunker_01_big_F",
+ "Land_Bunker_01_HQ_F",
+ "Land_Bunker_01_small_F",
+ "Land_Bunker_01_tall_F",
"Land_Bunker_02_light_double_F",
"Land_Cargo_House_V1_F",
"Land_Cargo_House_V2_F",
@@ -822,6 +865,12 @@ class Buildings {
};
};
+ class Gulfcoast {
+ classes[] = {
+ "Land_mil_mobile"
+ };
+ };
+
class Malden {
classes[] = {
"Land_Bunker_01_big_F",
@@ -888,6 +937,9 @@ class Buildings {
"Land_Rail_Station_Big_F",
"Land_Rail_Warehouse_Small_F",
"Land_Sawmill_01_F",
+ "Land_SCF_01_condenser_F",
+ "Land_SCF_01_crystallizer_F",
+ "Land_SCF_01_crystallizerTowers_F",
"Land_SCF_01_generalBuilding_F",
"Land_Shed_Ind02",
"Land_Shed_08_brown_F",
@@ -999,5 +1051,11 @@ class Buildings {
"Land_Research_house_V1_F",
"Land_Research_HQ_F"
};
+
+ class Gulfcoast {
+ classes[] = {
+ "Land_em_medical_center_01"
+ };
+ };
};
};
diff --git a/addons/lootspawner/src/fn_Lootspawner_GetBuildingPos.sqf b/addons/lootspawner/src/fn_Lootspawner_GetBuildingPos.sqf
index f54f54c4ce795ab0b1fd3cea4632b3d88db7cb4b..2319fc38135228c449dcfe3513a484530009b149 100644
--- a/addons/lootspawner/src/fn_Lootspawner_GetBuildingPos.sqf
+++ b/addons/lootspawner/src/fn_Lootspawner_GetBuildingPos.sqf
@@ -22,7 +22,7 @@ if isNil "EPOCH_returnConfig" exitWith {
private _config = "CfgBuildingLootPos" call EPOCH_returnConfig;
private _cfg = _config >> typeOf _building >> "pseudoBuildingPos";
-if ("<NULL-config>" == str _cfg) then {
+if !isArray(_cfg) then {
[[], false];
} else {
private _pos = getArray _cfg;
diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp
index 9e47ed77798c83d49f1cfc7fdf2dd7f7869a61c2..b3987ba6ec56919ff89d0c91ee53812f5fabb1be 100644
--- a/addons/main/script_version.hpp
+++ b/addons/main/script_version.hpp
@@ -1,4 +1,4 @@
#define MAJOR 1
#define MINOR 11
#define PATCH 1
-#define BUILD 1516
+#define BUILD 1521
diff --git a/addons/map-additions/include/additions/Gulfcoast.hpp b/addons/map-additions/include/additions/Gulfcoast.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..e818b322ea0124adcb77fbc536a16f4ac4e1576e
--- /dev/null
+++ b/addons/map-additions/include/additions/Gulfcoast.hpp
@@ -0,0 +1,14 @@
+class Gulfcoast {
+ version = 1;
+ replaceObjects[] = {
+ {"Land_aa3_barn","Land_Barn_03_small_F"},
+ {"Land_aa3_barn_v1","Land_Barn_03_small_F"},
+ {"Land_GC_warehouse","Land_Barn_04_F"},
+ {"Land_GC_barn_1","Land_Barn_03_small_F"},
+ {"Land_GC_barn_2","Land_Barn_03_small_F"},
+ {"Land_Hanger_v1","Land_Airport_01_hangar_F"},
+ {"Land_double_1","Land_House_Big_04_F",90},
+ {"Land_double_2","Land_House_Big_04_F",90},
+ {"Land_double_3","Land_House_Big_04_F",90}
+ };
+};
diff --git a/addons/map-additions/include/config.hpp b/addons/map-additions/include/config.hpp
index 62f994350cc629d115d6bd83aa4a441d7bfb3910..36213dcd05c8d6d73d41eeecd5ee9b00d0f44f71 100644
--- a/addons/map-additions/include/config.hpp
+++ b/addons/map-additions/include/config.hpp
@@ -1,6 +1,7 @@
class MapAdditions {
#include "additions\Australia.hpp"
#include "additions\Enoch.hpp"
+ #include "additions\Gulfcoast.hpp"
#include "additions\Tanoa.hpp"
#include "additions\xcam_taunus.hpp"
};
diff --git a/addons/squatters/include/config.hpp b/addons/squatters/include/config.hpp
index 8690986f1370ed9f285f53a5d5366fe7b5b84ccc..015f04f361b7033c3180cdcfd739cfc8bb1e8f14 100644
--- a/addons/squatters/include/config.hpp
+++ b/addons/squatters/include/config.hpp
@@ -659,6 +659,7 @@ class Squatters {
class Gulfcoast : ZoneDefault {
class Zone_Base : Zone_Base {
+ denialLocationSizeMultiplier = 0.65;
patrolGroupSize[] = {3, 6};
vehicleChance = 85;
vehicleMaxLevel = 2;