The random custom maps now use the Classic Skirmish map settings (i.e…

…. building sites are disabled)
Andrettin · Aug 17, 2022 · 280e9b0 · 280e9b0
1 parent af79f3e
commit 280e9b0
Show file tree

Hide file tree

Showing 30 changed files with 97 additions and 104 deletions.
diff --git a/maps/random/random-map-archipelago.smpt b/maps/random/random-map-archipelago.smpt
diff --git a/maps/random/random-map-archipelago.sms b/maps/random/random-map-archipelago.sms
diff --git a/maps/random/random-map-cave-symmetric.smp b/maps/random/random-map-cave-symmetric.smp
diff --git a/maps/random/random-map-cave.smp b/maps/random/random-map-cave.smp
diff --git a/maps/random/random-map-fairlimbed-forest-symmetric.smp b/maps/random/random-map-fairlimbed-forest-symmetric.smp
diff --git a/maps/random/random-map-fairlimbed-forest.smp b/maps/random/random-map-fairlimbed-forest.smp
diff --git a/maps/random/random-map-forest-symmetric.smp b/maps/random/random-map-forest-symmetric.smp
diff --git a/maps/random/random-map-forest.smp b/maps/random/random-map-forest.smp
diff --git a/maps/random/random-map-swamp-symmetric.smp b/maps/random/random-map-swamp-symmetric.smp
diff --git a/maps/random/random-map-swamp.smp b/maps/random/random-map-swamp.smp
diff --git a/maps/random/random-map-valley.smp b/maps/random/random-map-valley.smp
diff --git a/maps/random/random-map-cave.sms → maps/random/random_cave.sms b/maps/random/random-map-cave.sms → maps/random/random_cave.sms
diff --git a/maps/random/random_cave.wmp b/maps/random/random_cave.wmp
@@ -0,0 +1,10 @@
+name = "Random Cave"
+map_size = { 128 128 }
+player_types = {
+	person
+	person
+	person
+	person
+}
+settings = classic_skirmish
+map_world = "Random"
diff --git a/maps/random/random-map-cave-symmetric.sms → maps/random/random_cave_symmetric.sms b/maps/random/random-map-cave-symmetric.sms → maps/random/random_cave_symmetric.sms
diff --git a/maps/random/random_cave_symmetric.wmp b/maps/random/random_cave_symmetric.wmp
@@ -0,0 +1,10 @@
+name = "Random Cave (Symmetric)"
+map_size = { 128 128 }
+player_types = {
+	person
+	person
+	person
+	person
+}
+settings = classic_skirmish
+map_world = "Random"
diff --git a/maps/random/random-map-fairlimbed-forest.sms → maps/random/random_fairlimbed_forest.sms b/maps/random/random-map-fairlimbed-forest.sms → maps/random/random_fairlimbed_forest.sms
diff --git a/maps/random/random_fairlimbed_forest.wmp b/maps/random/random_fairlimbed_forest.wmp
@@ -0,0 +1,10 @@
+name = "Random Fairlimbed Forest"
+map_size = { 128 128 }
+player_types = {
+	person
+	person
+	person
+	person
+}
+settings = classic_skirmish
+map_world = "Random"
diff --git a/...andom-map-fairlimbed-forest-symmetric.sms → ...om/random_fairlimbed_forest_symmetric.sms b/...andom-map-fairlimbed-forest-symmetric.sms → ...om/random_fairlimbed_forest_symmetric.sms
diff --git a/maps/random/random_fairlimbed_forest_symmetric.wmp b/maps/random/random_fairlimbed_forest_symmetric.wmp
@@ -0,0 +1,10 @@
+name = "Random Fairlimbed Forest (Symmetric)"
+map_size = { 128 128 }
+player_types = {
+	person
+	person
+	person
+	person
+}
+settings = classic_skirmish
+map_world = "Random"
diff --git a/maps/random/random-map-forest.sms → maps/random/random_forest.sms b/maps/random/random-map-forest.sms → maps/random/random_forest.sms
diff --git a/maps/random/random_forest.wmp b/maps/random/random_forest.wmp
@@ -0,0 +1,10 @@
+name = "Random Forest"
+map_size = { 128 128 }
+player_types = {
+	person
+	person
+	person
+	person
+}
+settings = classic_skirmish
+map_world = "Random"
diff --git a/maps/random/random-map-forest-symmetric.sms → maps/random/random_forest_symmetric.sms b/maps/random/random-map-forest-symmetric.sms → maps/random/random_forest_symmetric.sms
diff --git a/maps/random/random_forest_symmetric.wmp b/maps/random/random_forest_symmetric.wmp
@@ -0,0 +1,10 @@
+name = "Random Forest (Symmetric)"
+map_size = { 128 128 }
+player_types = {
+	person
+	person
+	person
+	person
+}
+settings = classic_skirmish
+map_world = "Random"
diff --git a/maps/random/random-map-swamp.sms → maps/random/random_swamp.sms b/maps/random/random-map-swamp.sms → maps/random/random_swamp.sms
diff --git a/maps/random/random_swamp.wmp b/maps/random/random_swamp.wmp
@@ -0,0 +1,10 @@
+name = "Random Swamp"
+map_size = { 128 128 }
+player_types = {
+	person
+	person
+	person
+	person
+}
+settings = classic_skirmish
+map_world = "Random"
diff --git a/maps/random/random-map-swamp-symmetric.sms → maps/random/random_swamp_symmetric.sms b/maps/random/random-map-swamp-symmetric.sms → maps/random/random_swamp_symmetric.sms
diff --git a/maps/random/random_swamp_symmetric.wmp b/maps/random/random_swamp_symmetric.wmp
@@ -0,0 +1,10 @@
+name = "Random Swamp (Symmetric)"
+map_size = { 128 128 }
+player_types = {
+	person
+	person
+	person
+	person
+}
+settings = classic_skirmish
+map_world = "Random"
diff --git a/maps/random/random-map-valley.sms → maps/random/random_valley.sms b/maps/random/random-map-valley.sms → maps/random/random_valley.sms
diff --git a/maps/random/random_valley.wmp b/maps/random/random_valley.wmp
@@ -0,0 +1,10 @@
+name = "Random Valley"
+map_size = { 128 128 }
+player_types = {
+	person
+	person
+	person
+	person
+}
+settings = classic_skirmish
+map_world = "Random"
diff --git a/scripts/map_generation.lua b/scripts/map_generation.lua
@@ -1464,7 +1464,6 @@ function CreateCritters(arg)
 			if (
 				species ~= ""
 				and GetUnitTypeData(unit_type_list[i], "Fauna")
-				and (MapWorld == "" or MapWorld == "Random" or MapWorld == GetWorldData(GetSpeciesData(species, "Homeworld"), "Name"))
 				and (GetUnitTypeData(unit_type_list[i], "Predator") == false or not arg.NoPredators)
 				and (GetUnitTypeData(unit_type_list[i], "Domain") ~= "air" or GetUnitTypeData(unit_type_list[i], "Predator") == false or not arg.NoFlyingCreeps)
 				and (GetUnitTypeData(unit_type_list[i], "Level") < 3 or GetUnitTypeData(unit_type_list[i], "Predator") == false or not arg.NoMightyCreeps)
@@ -2345,9 +2344,6 @@ function GenerateRandomMap(arg)
 			CreateNeutralBuildings("unit_mercenary_camp", 1, 0, CMap:get():get_info():get_map_width() - 3, 0, CMap:get():get_info():get_map_height() - 3, symmetric)
 		end
 
-		CreateNeutralBuildings("unit_minor_building_site", (CMap:get():get_info():get_map_width() * CMap:get():get_info():get_map_height()) / 256, 0, CMap:get():get_info():get_map_width() - 3, 0, CMap:get():get_info():get_map_height() - 3, symmetric)
-		CreateNeutralBuildings("unit_building_site", (CMap:get():get_info():get_map_width() * CMap:get():get_info():get_map_height()) / 1024, 0, CMap:get():get_info():get_map_width() - 3, 0, CMap:get():get_info():get_map_height() - 3, symmetric)
-
 		-- create oil patches
 	--	Count = 2
 	--	while (Count > 0) do
@@ -3046,11 +3042,6 @@ function FindAppropriateNeutralBuildingSpawnPoint(building_type, min_x, max_x, m
 			max_y = max_y / 2
 		end
 
-		local is_building_site = false
-		if (building_type == "unit_minor_building_site" or building_type == "unit_building_site" or building_type == "unit_major_building_site") then
-			is_building_site = true
-		end
-
 		while (location_found == false and WhileCount < 1000) do
 			RandomX = SyncRand(max_x - min_x + 1) + min_x
 			RandomY = SyncRand(max_y - min_y + 1) + min_y
@@ -3085,19 +3076,15 @@ function FindAppropriateNeutralBuildingSpawnPoint(building_type, min_x, max_x, m
 			end
 
 			if (in_buildable_land) then
-				if (is_building_site) then
-					location_found = true
-				else
-					local unit_quantity = 0
-					for i=0,(PlayerMax - 2) do
-						unit_quantity = unit_quantity + GetNumUnitsAt(i, "any", {RandomX - 16, RandomY - 16}, {RandomX + (GetUnitTypeData(building_type, "TileWidth") - 1) + 16, RandomY + (GetUnitTypeData(building_type, "TileHeight") - 1) + 16})
-					end
+				local unit_quantity = 0
+				for i=0,(PlayerMax - 2) do
+					unit_quantity = unit_quantity + GetNumUnitsAt(i, "any", {RandomX - 16, RandomY - 16}, {RandomX + (GetUnitTypeData(building_type, "TileWidth") - 1) + 16, RandomY + (GetUnitTypeData(building_type, "TileHeight") - 1) + 16})
+				end
 
-					unit_quantity = unit_quantity + GetNumUnitsAt(PlayerNumNeutral, "buildings", {RandomX - 16, RandomY - 16}, {RandomX + (GetUnitTypeData(building_type, "TileWidth") - 1) + 16, RandomY + (GetUnitTypeData(building_type, "TileHeight") - 1) + 16}) + GetNumUnitsAt(PlayerNumNeutral, building_type, {RandomX - 16, RandomY - 16}, {RandomX + (GetUnitTypeData(building_type, "TileWidth") - 1) + 16, RandomY + (GetUnitTypeData(building_type, "TileHeight") - 1) + 16})
+				unit_quantity = unit_quantity + GetNumUnitsAt(PlayerNumNeutral, "buildings", {RandomX - 16, RandomY - 16}, {RandomX + (GetUnitTypeData(building_type, "TileWidth") - 1) + 16, RandomY + (GetUnitTypeData(building_type, "TileHeight") - 1) + 16}) + GetNumUnitsAt(PlayerNumNeutral, building_type, {RandomX - 16, RandomY - 16}, {RandomX + (GetUnitTypeData(building_type, "TileWidth") - 1) + 16, RandomY + (GetUnitTypeData(building_type, "TileHeight") - 1) + 16})
 
-					if (unit_quantity < 1) then
-						location_found = true
-					end
+				if (unit_quantity < 1) then
+					location_found = true
 				end
 			end
 			WhileCount = WhileCount + 1
@@ -4055,9 +4042,6 @@ function GenerateValley(direction, lake_quantity)
 
 	CreateGoldSpots((CMap:get():get_info():get_map_width() * CMap:get():get_info():get_map_height()) / 2048, 0, CMap:get():get_info():get_map_width() - 3, 0, CMap:get():get_info():get_map_height() - 3, symmetric)
 
-	CreateNeutralBuildings("unit_minor_building_site", (CMap:get():get_info():get_map_width() * CMap:get():get_info():get_map_height()) / 256, 0, CMap:get():get_info():get_map_width() - 3, 0, CMap:get():get_info():get_map_height() - 3, symmetric)
-	CreateNeutralBuildings("unit_building_site", (CMap:get():get_info():get_map_width() * CMap:get():get_info():get_map_height()) / 1024, 0, CMap:get():get_info():get_map_width() - 3, 0, CMap:get():get_info():get_map_height() - 3, symmetric)
-
 	if (GetCurrentTileset() == "swamp" or GetCurrentTileset() == "cave") then
 		CreateNeutralBuildings("unit_mercenary_camp", 1, 0, CMap:get():get_info():get_map_width() - 3, 0, CMap:get():get_info():get_map_height() - 3, symmetric)
 	end
@@ -6009,10 +5993,6 @@ function GenerateCave(town_halls, symmetric)
 		CreateNeutralBuildings("unit-hole", (CMap:get():get_info():get_map_width() * CMap:get():get_info():get_map_height()) / 4096, 0, CMap:get():get_info():get_map_width() - 2, 0, CMap:get():get_info():get_map_height() - 2, symmetric)
 	end
 
-	CreateNeutralBuildings("unit_minor_building_site", (CMap:get():get_info():get_map_width() * CMap:get():get_info():get_map_height()) / 256, 0, CMap:get():get_info():get_map_width() - 3, 0, CMap:get():get_info():get_map_height() - 3, symmetric)
-	CreateNeutralBuildings("unit_building_site", (CMap:get():get_info():get_map_width() * CMap:get():get_info():get_map_height()) / 1024, 0, CMap:get():get_info():get_map_width() - 3, 0, CMap:get():get_info():get_map_height() - 3, symmetric)
-
-
 	CreateNeutralBuildings("unit_mercenary_camp", 1, 0, CMap:get():get_info():get_map_width() - 3, 0, CMap:get():get_info():get_map_height() - 3, symmetric)
 
 	for i=0,(PlayerMax - 2) do