Squashed commit of the following:

commit 37b1f7c Merge: bd353e4 2b0b806 Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com> Date: Wed Aug 21 21:31:56 2024 +0300 Merge pull request #289 from SilenceIsFatto/Maxx Builder Box Expansion commit 2b0b806 Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com> Date: Wed Aug 21 21:31:24 2024 +0300 PreBuilt interaction place holders commit 9041e61 Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com> Date: Wed Aug 21 17:16:51 2024 +0300 cDLC Buildable list update commit bd78fd4 Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com> Date: Wed Aug 21 09:12:25 2024 +0300 fixed skill issues commit 7929eed Merge: 2af1b53 8b36ab1 Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com> Date: Tue Aug 20 20:56:25 2024 +0300 General Readability commit 2af1b53 Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com> Date: Tue Aug 20 20:48:38 2024 +0300 Syntax Errors commit 8b36ab1 Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com> Date: Tue Aug 20 20:11:27 2024 +0300 Update A3A/addons/maps/Antistasi_Altis.Altis/mapInfo.hpp Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com> commit 7c72445 Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com> Date: Tue Aug 20 20:10:30 2024 +0300 Update A3A/addons/maps/BuildObjectsList.hpp Co-authored-by: Silence <78276788+SilenceIsFatto@users.noreply.github.com> commit 24a0b0f Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com> Date: Tue Aug 20 19:56:42 2024 +0300 Update fn_buildingPlacer.sqf commit 93a4386 Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com> Date: Tue Aug 20 19:55:26 2024 +0300 comment out instead of delete commit f762249 Author: MaxxLite <162753200+UAC-MaxxLite@users.noreply.github.com> Date: Tue Aug 20 19:48:17 2024 +0300 updated builderbox
SilenceIsFatto · Aug 22, 2024 · 3f7dd2c · 3f7dd2c
1 parent e4c6889
commit 3f7dd2c
Show file tree

Hide file tree

Showing 60 changed files with 338 additions and 431 deletions.
diff --git a/A3A/addons/core/functions/Builder/fn_buildingPlacer.sqf b/A3A/addons/core/functions/Builder/fn_buildingPlacer.sqf
@@ -78,7 +78,7 @@ private _upKeyEH = _emptyDisplay displayAddEventHandler ["KeyUp", {
         if ((A3A_building_EHDB # BUILD_OBJECT_SELECTED_STRING) isEqualTo "Land_Can_V2_F") exitwith {};	// temp objects not built.
 
         if (_tempObject distance (A3A_building_EHDB # BUILD_RADIUS_OBJECT_CENTER) > (A3A_building_EHDB # BUILD_RADIUS)) exitwith {};
-        if (isOnRoad getPosATL _tempObject) exitwith {};	// can't build on roads
+        //if (isOnRoad getPosATL _tempObject) exitwith {};	// can't build on roads
 
         private _price = (A3A_building_EHDB # OBJECT_PRICE);
         private _supply = (A3A_building_EHDB # AVAILABLE_MONEY);
@@ -292,4 +292,4 @@ private _eventHanderEachFrame = addMissionEventHandler ["EachFrame", {
 
 }];
 
-A3A_building_EHDB set [EACH_FRAME_EH, _eventHanderEachFrame];
+A3A_building_EHDB set [EACH_FRAME_EH, _eventHanderEachFrame];
diff --git a/A3A/addons/core/functions/Builder/fn_placeBuilderObjects.sqf b/A3A/addons/core/functions/Builder/fn_placeBuilderObjects.sqf
@@ -15,9 +15,11 @@ Arguments:
 params [["_objects",[],[[]]]];
 
 private _constructionObjects = [
-    ["Land_Pallets_F", 30],
-    ["Land_CinderBlocks_01_F", 100],
-    ["Land_WoodenPlanks_01_messy_pine_F", 999999]
+    ["Land_WoodenBox_F", 50],
+    ["Land_WoodenBox_02_F", 100],
+    ["Land_WoodenCrate_01_stack_x5_F", 250],
+    ["Land_PaperBox_closed_F", 400],
+    ["Land_WoodenCrate_01_F", 999999]
 ];
 
 // other options:

diff --git a/A3A/addons/maps/Antistasi_Altis.Altis/mapInfo.hpp b/A3A/addons/maps/Antistasi_Altis.Altis/mapInfo.hpp
@@ -1,3 +1,4 @@
+#include "..\BuildObjectsList.hpp"
 class altis {
 	population[] = {
 		{"Therisa",154},{"Zaros",371},{"Poliakko",136},{"Katalaki",95},{"Alikampos",115},{"Neochori",309},{"Stavros",122},{"Lakka",173},{"AgiosDionysios",84},{"Panochori",264},{"Topolia",33},{"Ekali",9},{"Pyrgos",531},{"Neri",242},{"Kore",133},{"Kavala",660},{"Aggelochori",395},{"Koroni",32},{"Gravia",291},{"Anthrakia",143},{"Syrta",151},{"Negades",120},{"Galati",151},{"Telos",84},{"Charkia",246},{"Athira",342},{"Dorida",168},{"Ifestiona",48},{"Chalkeia",214},{"AgiosKonstantinos",39},{"Abdera",89},{"Panagia",91},{"Nifi",24},{"Rodopoli",212},{"Kalithea",36},{"Selakano",120},{"Frini",69},{"AgiosPetros",11},{"Feres",92},{"AgiaTriada",8},{"Paros",396},{"Kalochori",189},{"Oreokastro",63},{"Ioannina",48},{"Delfinaki",29},{"Sofia",179},{"Molos",188}
@@ -21,13 +22,9 @@ class altis {
 	};
 	climate = "arid";
 	buildObjects[] = {
-		// Large vanilla arid structures
-		{"Land_BagBunker_Large_F", 300}, {"Land_BagBunker_Tower_F", 300}, {"Land_BagBunker_Small_F", 60},
-		{"Land_Shed_09_F", 120}, {"Land_Shed_10_F", 140},
-		// Vanilla arid sandbag walls
-		{"Land_BagFence_Long_F", 10}, {"Land_BagFence_Round_F", 10}, {"Land_BagFence_Short_F", 10},
-		// Non-camo vanilla stuff
-		{"Land_SandbagBarricade_01_half_F", 20}, {"Land_SlumWall_01_s_2m_F", 5}, {"Land_PillboxBunker_01_hex_F", 200},
-		{"Land_Barricade_01_4m_F", 30}, {"Land_GuardBox_01_brown_F", 80}, {"Land_Tyres_F", 10}
+		BUILDABLES_HISTORIC,
+		BUILDABLES_MODERN_SAND,
+		BUILDABLES_ARID,
+		BUILDABLES_UNIVERSAL
 	};
 };
diff --git a/A3A/addons/maps/Antistasi_Enoch.Enoch/mapInfo.hpp b/A3A/addons/maps/Antistasi_Enoch.Enoch/mapInfo.hpp
@@ -1,3 +1,4 @@
+#include "..\BuildObjectsList.hpp"
 class enoch {
 	population[] = {
 		{"Adamow",200},{"Bielawa",150},{"Borek",150},{"Brena",150},{"Dolnik",100},{"Gieraltow",400},{"Gliniska",150},{"Grabin",250},{"Huta",150},{"Karlin",50},{"Kolembrody",100},{"Lembork",50},{"Lipina",100},{"Lukow",200},{"Muratyn",50},{"Nadbor",600},{"Nidek",100},{"Olszanka",100},{"Polana",100},{"Radacz",150},{"Radunin",150},{"Roztoka",50},{"Sitnik",150},{"Sobotka",100},{"Tarnow",200},{"Topolin",650},{"Zalesie",150},{"Zapadlisko",100}
@@ -19,13 +20,9 @@ class enoch {
 	};
 	climate = "temperate";
 	buildObjects[] = {
-		// Large vanilla tropical structures
-		{"Land_BagBunker_01_large_green_F", 300}, {"Land_HBarrier_01_tower_green_F", 300}, {"Land_BagBunker_01_small_green_F", 60},
-		{"Land_Shed_09_F", 120}, {"Land_Shed_10_F", 140},
-		// vanilla tropical sandbag walls
-		{"Land_BagFence_01_short_green_F", 10}, {"Land_BagFence_01_round_green_F", 10}, {"Land_BagFence_01_long_green_F", 10},
-		// Non-camo vanilla stuff
-		{"Land_SandbagBarricade_01_half_F", 20}, {"Land_SlumWall_01_s_2m_F", 5}, {"Land_PillboxBunker_01_hex_F", 200},
-		{"Land_Barricade_01_4m_F", 30}, {"Land_GuardBox_01_brown_F", 80}, {"Land_Tyres_F", 10}
+		BUILDABLES_HISTORIC,
+		BUILDABLES_MODERN_GREEN,
+		BUILDABLES_TEMPERATE,
+		BUILDABLES_UNIVERSAL
 	};
 };
diff --git a/A3A/addons/maps/Antistasi_Esseker.Esseker/mapInfo.hpp b/A3A/addons/maps/Antistasi_Esseker.Esseker/mapInfo.hpp
@@ -1,3 +1,4 @@
+#include "..\BuildObjectsList.hpp"
 class esseker {
 	population[] = {
 		{"Posestra",68},{"Chokory",89},{"Rama",74},{"Melina", 90},
@@ -30,14 +31,9 @@ class esseker {
 	};
 	climate = "temperate";
 	buildObjects[] = {
-		{"Land_fortified_nest_big_EP1", 300}, {"Land_Fort_Watchtower_EP1", 300}, {"Fortress2", 200}, {"Fortress1", 100}, {"Fort_Nest", 60},
-		{"Land_Shed_09_F", 120}, {"Land_Shed_10_F", 140}, {"ShedBig", 100}, {"Shed", 100}, {"ShedSmall", 60}, {"Land_GuardShed", 30},
-		// CUP sandbag walls
-		{"Land_BagFenceLong", 10}, {"Land_BagFenceShort", 10}, {"Land_BagFenceRound", 10},        //{"Land_BagFenceEnd", 0, 5}, 
-		// Other CUP fences
-		{"Land_fort_artillery_nest_EP1", 200}, {"Land_fort_rampart_EP1", 50}, {"Fort_Barricade", 50}, {"Fence", 20}, {"FenceWood", 10}, {"FenceWoodPalet", 10}, 
-		// Non-camo vanilla stuff
-		{"Land_SandbagBarricade_01_half_F", 20}, {"Land_SlumWall_01_s_2m_F", 5}, {"Land_PillboxBunker_01_hex_F", 200},
-		{"Land_Barricade_01_4m_F", 30}, {"Land_GuardBox_01_brown_F", 80}, {"Land_Tyres_F", 10}
+		BUILDABLES_HISTORIC,
+		BUILDABLES_MODERN_GREEN,
+		BUILDABLES_TEMPERATE,
+		BUILDABLES_UNIVERSAL
 	};
 };
diff --git a/A3A/addons/maps/Antistasi_Gulfcoast.Gulfcoast/mapInfo.hpp b/A3A/addons/maps/Antistasi_Gulfcoast.Gulfcoast/mapInfo.hpp
@@ -1,3 +1,4 @@
+#include "..\BuildObjectsList.hpp"
 class Gulfcoast {
 	population[] = {
 		{"haven", 145},{"iona", 133},{"terraceia", 670},{"Lely", 89},{"laurel", 190},{"cayocosta", 129},{"hobesound", 275},{"acline", 62},{"alva", 86},{"northfort", 303},{"solana", 74},{"croom", 48},{"pineridge", 76},{"labelle", 46},{"goodland", 73},{"keela", 125},{"harker", 46},{"orionestates", 164},{"captivabeach", 90},{"captivasound", 54},{"stjamescity", 136},{"tice", 89},{"bokeelia", 105},{"osprey", 64},{"northterra", 230},{"starmand", 126},{"riverside", 28},{"woodford", 56},{"edgewood", 152},{"crosscity", 95},{"eastwood", 93},{"cooperhead", 22},{"bellavida", 216},{"marco", 71},{"lochmoor", 49},{"madeira", 75},{"rotonda", 284},{"felda", 35},{"lakeport", 138},{"harborside", 98},{"gulfshore", 267},{"caperassa", 666},{"sanbelshores", 61},{"palmdale", 122},{"sebring", 539},{"esteropass", 51},{"hurpass", 38},{"boca", 201},{"sanbelcity", 411},{"salvista", 142},{"arcadia", 129},{"delmare", 322},{"sancarlos", 188},{"corelcity", 486}
@@ -21,14 +22,10 @@ class Gulfcoast {
 	};
 	climate = "arid";
 	buildObjects[] = {
-		{"Land_fortified_nest_big_EP1", 300}, {"Land_Fort_Watchtower_EP1", 300}, {"Fortress2", 200}, {"Fortress1", 100}, {"Fort_Nest", 60},
-		{"Land_Shed_09_F", 120}, {"Land_Shed_10_F", 140}, {"ShedBig", 100}, {"Shed", 100}, {"ShedSmall", 60}, {"Land_GuardShed", 30},
-		// CUP sandbag walls
-		{"Land_BagFenceLong", 10}, {"Land_BagFenceShort", 10}, {"Land_BagFenceRound", 10},        //{"Land_BagFenceEnd", 0, 5}, 
-		// Other CUP fences
-		{"Land_fort_artillery_nest_EP1", 200}, {"Land_fort_rampart_EP1", 50}, {"Fort_Barricade", 50}, {"Fence", 20}, {"FenceWood", 10}, {"FenceWoodPalet", 10}, 
-		// Non-camo vanilla stuff
-		{"Land_SandbagBarricade_01_half_F", 20}, {"Land_SlumWall_01_s_2m_F", 5}, {"Land_PillboxBunker_01_hex_F", 200},
-		{"Land_Barricade_01_4m_F", 30}, {"Land_GuardBox_01_brown_F", 80}, {"Land_Tyres_F", 10}
+		BUILDABLES_HISTORIC,
+		BUILDABLES_MODERN_SAND,
+		BUILDABLES_ARID,
+		BUILDABLES_CUP,
+		BUILDABLES_UNIVERSAL
 	};
 };
diff --git a/A3A/addons/maps/Antistasi_Kapaulio.Kapaulio/mapInfo.hpp b/A3A/addons/maps/Antistasi_Kapaulio.Kapaulio/mapInfo.hpp
@@ -1,3 +1,4 @@
+#include "..\BuildObjectsList.hpp"
 class kapaulio {
 	population[] = {
 		{"Koroina", 159},{"Kurio", 63},{"Bangger", 68},{"Catanga", 57},{"Jambola", 167},{"Lahaina", 46},{"Belladonna", 42},{"Petra", 49},{"Lantana", 63},{"Cabana", 24},{"Bowna", 69},{"Perots", 148},{"Ragnar", 0},{"Caserma", 18},{"Ebsal", 12},{"Oden", 96},{"Rugusa", 219},{"Bazanti", 99},{"Mijutti", 43},{"Yannagar", 112},{"nova", 104},{"Singalli", 10},{"Butu", 56},{"Sole", 50},{"Huri", 11},{"agnir", 27},{"padre", 67},{"Bangar", 20},{"Haddawassi", 258},{"Viking", 61},{"Capsicum", 21},{"Anubis", 91},{"brooni", 24},{"Malikoi", 102},{"Hawasi", 210},{"casataina", 94},{"Jappoli", 231},{"Cancom", 5},{"Jambalaya", 652},{"Bonga", 534},{"Ubomo", 454},{"Kawi", 799},{"Lambo", 152},{"Kupri", 323},{"Bologa", 173},{"Saranader", 56},{"Lundy", 62},{"Cachina", 64},{"Hasakaya", 48},{"Salty", 184}
@@ -17,13 +18,10 @@ class kapaulio {
 	};
 	climate = "tropical";
 	buildObjects[] = {
-		// Large vanilla arid structures
-		{"Land_BagBunker_Large_F", 300}, {"Land_BagBunker_Tower_F", 300}, {"Land_BagBunker_Small_F", 60},
-		{"Land_Shed_09_F", 120}, {"Land_Shed_10_F", 140},
-		// Vanilla arid sandbag walls
-		{"Land_BagFence_Long_F", 10}, {"Land_BagFence_Round_F", 10}, {"Land_BagFence_Short_F", 10},
-		// Non-camo vanilla stuff
-		{"Land_SandbagBarricade_01_half_F", 20}, {"Land_SlumWall_01_s_2m_F", 5}, {"Land_PillboxBunker_01_hex_F", 200},
-		{"Land_Barricade_01_4m_F", 30}, {"Land_GuardBox_01_brown_F", 80}, {"Land_Tyres_F", 10}
+		BUILDABLES_HISTORIC,
+		BUILDABLES_MODERN_GREEN,
+		BUILDABLES_TROPIC,
+		BUILDABLES_CUP,
+		BUILDABLES_UNIVERSAL
 	};
 };
diff --git a/A3A/addons/maps/Antistasi_Kunduz.Kunduz/mapInfo.hpp b/A3A/addons/maps/Antistasi_Kunduz.Kunduz/mapInfo.hpp
@@ -1,3 +1,4 @@
+#include "..\BuildObjectsList.hpp"
 class kunduz {
 	/*
 	As the CfgWorlds/Names are completely fucked on this map, here a list of the names:
@@ -34,13 +35,9 @@ class kunduz {
 	};
 	climate = "arid";
 	buildObjects[] = {
-		// Large vanilla arid structures
-		{"Land_BagBunker_Large_F", 300}, {"Land_BagBunker_Tower_F", 300}, {"Land_BagBunker_Small_F", 60},
-		{"Land_Shed_09_F", 120}, {"Land_Shed_10_F", 140},
-		// Vanilla arid sandbag walls
-		{"Land_BagFence_Long_F", 10}, {"Land_BagFence_Round_F", 10}, {"Land_BagFence_Short_F", 10},
-		// Non-camo vanilla stuff
-		{"Land_SandbagBarricade_01_half_F", 20}, {"Land_SlumWall_01_s_2m_F", 5}, {"Land_PillboxBunker_01_hex_F", 200},
-		{"Land_Barricade_01_4m_F", 30}, {"Land_GuardBox_01_brown_F", 80}, {"Land_Tyres_F", 10}
+		BUILDABLES_HISTORIC,
+		BUILDABLES_MODERN_SAND,
+		BUILDABLES_ARID,
+		BUILDABLES_UNIVERSAL
 	};
 };
diff --git a/A3A/addons/maps/Antistasi_Lythium.Lythium/mapInfo.hpp b/A3A/addons/maps/Antistasi_Lythium.Lythium/mapInfo.hpp
@@ -1,3 +1,4 @@
+#include "..\BuildObjectsList.hpp"
 class lythium 
 {
 	population[] = 
@@ -69,13 +70,10 @@ class lythium
 	};
 	climate = "arid";
 	buildObjects[] = {
-		// Large vanilla arid structures
-		{"Land_BagBunker_Large_F", 300}, {"Land_BagBunker_Tower_F", 300}, {"Land_BagBunker_Small_F", 60},
-		{"Land_Shed_09_F", 120}, {"Land_Shed_10_F", 140},
-		// Vanilla arid sandbag walls
-		{"Land_BagFence_Long_F", 10}, {"Land_BagFence_Round_F", 10}, {"Land_BagFence_Short_F", 10},
-		// Non-camo vanilla stuff
-		{"Land_SandbagBarricade_01_half_F", 20}, {"Land_SlumWall_01_s_2m_F", 5}, {"Land_PillboxBunker_01_hex_F", 200},
-		{"Land_Barricade_01_4m_F", 30}, {"Land_GuardBox_01_brown_F", 80}, {"Land_Tyres_F", 10}
+		BUILDABLES_HISTORIC,
+		BUILDABLES_MODERN_SAND,
+		BUILDABLES_ARID,
+		BUILDABLES_JBAD,
+		BUILDABLES_UNIVERSAL
 	};
 };
diff --git a/A3A/addons/maps/Antistasi_Malden.Malden/mapInfo.hpp b/A3A/addons/maps/Antistasi_Malden.Malden/mapInfo.hpp
@@ -1,3 +1,4 @@
+#include "..\BuildObjectsList.hpp"
 class malden {
 	population[] = {}; //automated data is fine and needs no adaptation
 	disabledTowns[] = {"Malden_C_Airport","Malden_L_Moray", "Malden_V_Lolisse"};
@@ -17,13 +18,9 @@ class malden {
 	};
 	climate = "arid";
 	buildObjects[] = {
-		// Large vanilla arid structures
-		{"Land_BagBunker_Large_F", 300}, {"Land_BagBunker_Tower_F", 300}, {"Land_BagBunker_Small_F", 60},
-		{"Land_Shed_09_F", 120}, {"Land_Shed_10_F", 140},
-		// Vanilla arid sandbag walls
-		{"Land_BagFence_Long_F", 10}, {"Land_BagFence_Round_F", 10}, {"Land_BagFence_Short_F", 10},
-		// Non-camo vanilla stuff
-		{"Land_SandbagBarricade_01_half_F", 20}, {"Land_SlumWall_01_s_2m_F", 5}, {"Land_PillboxBunker_01_hex_F", 200},
-		{"Land_Barricade_01_4m_F", 30}, {"Land_GuardBox_01_brown_F", 80}, {"Land_Tyres_F", 10}
+		BUILDABLES_HISTORIC,
+		BUILDABLES_MODERN_SAND,
+		BUILDABLES_ARID,
+		BUILDABLES_UNIVERSAL
 	};
 };
diff --git a/A3A/addons/maps/Antistasi_Napf.Napf/mapInfo.hpp b/A3A/addons/maps/Antistasi_Napf.Napf/mapInfo.hpp
@@ -1,3 +1,4 @@
+#include "..\BuildObjectsList.hpp"
 class napf {
 	population[] = {}; //automated data is fine and needs no adaptation
 	disabledTowns[] = {"Island_Feldmoos", "Island_Bernerplatte", "Insel_Pfeffikon", "mil_SouthAirstrip", "LandMark_Hubel", "Insel_Hasenmatt", "pass_Rorenpass", "Castle_Froburg", "castle_Homburg", "Insel_Suhrenfeld"};
@@ -17,13 +18,10 @@ class napf {
 	};
 	climate = "temperate";
 	buildObjects[] = {
-		// Large vanilla arid structures
-		{"Land_BagBunker_Large_F", 300}, {"Land_BagBunker_Tower_F", 300}, {"Land_BagBunker_Small_F", 60},
-		{"Land_Shed_09_F", 120}, {"Land_Shed_10_F", 140},
-		// Vanilla arid sandbag walls
-		{"Land_BagFence_Long_F", 10}, {"Land_BagFence_Round_F", 10}, {"Land_BagFence_Short_F", 10},
-		// Non-camo vanilla stuff
-		{"Land_SandbagBarricade_01_half_F", 20}, {"Land_SlumWall_01_s_2m_F", 5}, {"Land_PillboxBunker_01_hex_F", 200},
-		{"Land_Barricade_01_4m_F", 30}, {"Land_GuardBox_01_brown_F", 80}, {"Land_Tyres_F", 10}
+		BUILDABLES_HISTORIC,
+		BUILDABLES_MODERN_GREEN,
+		BUILDABLES_TEMPERATE,
+		BUILDABLES_CUP,
+		BUILDABLES_UNIVERSAL
 	};
 };
diff --git a/A3A/addons/maps/Antistasi_NapfWinter.NapfWinter/mapInfo.hpp b/A3A/addons/maps/Antistasi_NapfWinter.NapfWinter/mapInfo.hpp
@@ -1,3 +1,4 @@
+#include "..\BuildObjectsList.hpp"
 class napfwinter {
 	population[] = {}; //automated data is fine and needs no adaptation
 	disabledTowns[] = {"Island_Feldmoos", "Island_Bernerplatte", "Insel_Pfeffikon", "mil_SouthAirstrip", "LandMark_Hubel", "Insel_Hasenmatt", "pass_Rorenpass", "Castle_Froburg", "castle_Homburg", "Insel_Suhrenfeld"};
@@ -17,13 +18,10 @@ class napfwinter {
 	};
 	climate = "arctic";
 	buildObjects[] = {
-		// Large vanilla arid structures
-		{"Land_BagBunker_Large_F", 300}, {"Land_BagBunker_Tower_F", 300}, {"Land_BagBunker_Small_F", 60},
-		{"Land_Shed_09_F", 120}, {"Land_Shed_10_F", 140},
-		// Vanilla arid sandbag walls
-		{"Land_BagFence_Long_F", 10}, {"Land_BagFence_Round_F", 10}, {"Land_BagFence_Short_F", 10},
-		// Non-camo vanilla stuff
-		{"Land_SandbagBarricade_01_half_F", 20}, {"Land_SlumWall_01_s_2m_F", 5}, {"Land_PillboxBunker_01_hex_F", 200},
-		{"Land_Barricade_01_4m_F", 30}, {"Land_GuardBox_01_brown_F", 80}, {"Land_Tyres_F", 10}
+		BUILDABLES_HISTORIC,
+		BUILDABLES_MODERN_SAND,
+		BUILDABLES_ARCTIC,
+		BUILDABLES_CUP,
+		BUILDABLES_UNIVERSAL
 	};
 };
diff --git a/A3A/addons/maps/Antistasi_OPTRE_Madrigal.OPTRE_Madrigal/mapInfo.hpp b/A3A/addons/maps/Antistasi_OPTRE_Madrigal.OPTRE_Madrigal/mapInfo.hpp
@@ -1,3 +1,4 @@
+#include "..\BuildObjectsList.hpp"
 class optre_madrigal {
 	population[] = {
 		{"Barcelonova", 683},{"Fort_Romeo", 124},{"Castilla_Facility", 229},{"Castra_Arcology", 360},{"Airbase", 336},{"Enix_Relay", 172},{"Merida", 473},{"Caralis", 197},{"Gibaja", 163},{"Ostia", 103},{"Malaca", 79},{"Laredo_Base", 197},{"Sierra_Outpost", 111},{"Victor_Outpost", 35},{"Gladius_Academy", 277},{"Adrada", 89},{"Nisa", 63},{"Luciana", 120},{"Gargantiel", 92},{"Onil", 55},{"Illana", 128},{"Arenys", 188},{"Neila", 171},{"Monroy", 118},{"Nasca", 43},{"Cartagena", 102},{"San_Jose", 82},{"Encinitas", 203},{"LaVilla_Resort", 115},{"Getaria", 230}
@@ -17,14 +18,11 @@ class optre_madrigal {
 	};
 	climate = "temperate";
 	buildObjects[] = {
-		// Large vanilla arid structures
-		{"Land_BagBunker_Large_F", 300}, {"Land_BagBunker_Tower_F", 300}, {"Land_BagBunker_Small_F", 60},
-		{"Land_Shed_09_F", 120}, {"Land_Shed_10_F", 140},
-		// Vanilla arid sandbag walls
-		{"Land_BagFence_Long_F", 10}, {"Land_BagFence_Round_F", 10}, {"Land_BagFence_Short_F", 10},
-		// Non-camo vanilla stuff
-		{"Land_SandbagBarricade_01_half_F", 20}, {"Land_SlumWall_01_s_2m_F", 5}, {"Land_PillboxBunker_01_hex_F", 200},
-		{"Land_Barricade_01_4m_F", 30}, {"Land_GuardBox_01_brown_F", 80}, {"Land_Tyres_F", 10}
+		BUILDABLES_HISTORIC,
+		BUILDABLES_MODERN_GREEN,
+		BUILDABLES_SCIFI,
+		BUILDABLES_TEMPERATE,
+		BUILDABLES_UNIVERSAL
 	};
 	// Needs to be re-done when possible
 };
diff --git a/A3A/addons/maps/Antistasi_Panthera3.Panthera3/mapInfo.hpp b/A3A/addons/maps/Antistasi_Panthera3.Panthera3/mapInfo.hpp
@@ -1,3 +1,4 @@
+#include "..\BuildObjectsList.hpp"
 class panthera3 {
 	population[] = {};
 	disabledTowns[] = {};
@@ -17,13 +18,10 @@ class panthera3 {
 	};
 	climate = "temperate";
 	buildObjects[] = {
-		// Large vanilla arid structures
-		{"Land_BagBunker_Large_F", 300}, {"Land_BagBunker_Tower_F", 300}, {"Land_BagBunker_Small_F", 60},
-		{"Land_Shed_09_F", 120}, {"Land_Shed_10_F", 140},
-		// Vanilla arid sandbag walls
-		{"Land_BagFence_Long_F", 10}, {"Land_BagFence_Round_F", 10}, {"Land_BagFence_Short_F", 10},
-		// Non-camo vanilla stuff
-		{"Land_SandbagBarricade_01_half_F", 20}, {"Land_SlumWall_01_s_2m_F", 5}, {"Land_PillboxBunker_01_hex_F", 200},
-		{"Land_Barricade_01_4m_F", 30}, {"Land_GuardBox_01_brown_F", 80}, {"Land_Tyres_F", 10}
+		BUILDABLES_HISTORIC,
+		BUILDABLES_MODERN_GREEN,
+		BUILDABLES_TEMPERATE,
+		BUILDABLES_CUP,
+		BUILDABLES_UNIVERSAL
 	};
 };
diff --git a/A3A/addons/maps/Antistasi_SPE_Mortain.SPE_Mortain/mapInfo.hpp b/A3A/addons/maps/Antistasi_SPE_Mortain.SPE_Mortain/mapInfo.hpp
@@ -1,3 +1,4 @@
+#include "..\BuildObjectsList.hpp"
 class SPE_Mortain {
 	population[] = {
 		{"Vil_Romagny", 477},{"Vil_Neufbourg", 562},{"Vil_Mortain", 878},{"Vil_Barthelemy", 305},{"Vil_Bellefontaine", 453},{"Vil_Tournerie", 253},{"Vil_La_Bougonniere", 76},{"Vil_Les_Liards", 219},{"Vil_La_Vieille_Vente", 78},{"Vil_La_Deliniere", 209},{"Vil_La_Bagotiere", 299},{"Vil_La_Baffardiere", 188},{"Vil_La_Menardiere", 241},{"Vil_lagranderoche", 91},{"Vil_belleeau", 103},{"Vil_longueveille", 236},{"Vil_Les_Aulnays", 255},{"Vil_LaGalpichere", 191},{"Vil_LeClosMonnier", 223},{"Vil_Abbeye_Blanche", 560},{"Vil_Le_Tertre", 321},{"Loc_La_Morinais", 385},{"Vil_Calvaire", 469},{"Vil_LePillon", 179},{"Vil_LaRiffaudiere", 110},{"Vil_Saint_Hilaire", 544},{"Vil_LaGesberdiere", 464},{"Vil_La_Fieffe_de_Brousse_Pave", 172},{"Vil_Ruandelle", 86},{"Vil_Le_Chene_des_Maires", 260},{"Vil_Brousse_Pave", 224},{"Vil_La_Giffardiere", 398}
@@ -22,11 +23,9 @@ class SPE_Mortain {
 	};
 	climate = "temperate";
 	buildObjects[] = {
-		// Pillbox bunkers
-		{"Land_PillboxBunker_01_hex_F", 200}, {"Land_PillboxBunker_01_rectangle_F", 300},
-		// SPE sandbag walls
-		{"Land_SPE_Sandbag_Long", 15}, {"Land_SPE_Sandbag_Short", 10}, {"Land_SPE_Sandbag_Nest", 15}, {"Land_SPE_Sandbag_Curve", 20},
-		// Some extra stuff from vanilla
-		{"Land_Barricade_01_4m_F", 30}, {"Land_GuardBox_01_brown_F", 80}, {"Land_Tyres_F", 10}
+		BUILDABLES_HISTORIC,
+		BUILDABLES_TEMPERATE,
+		BUILDABLES_SPE,
+		BUILDABLES_UNIVERSAL
 	};
 };