Move entities from other/ to structures/.

Because they inherit from template_structure.xml.

Patch by: @Nescio
Differential Revision: D3097
This was SVN commit r24193.

binaries/data/mods/public/maps/random/caledonian_meadows.js

@@ -39,9 +39,9 @@ function placeMine(point, centerEntity)
 // Food, fences with domestic animals
 g_WallStyles.other = {
 	"overlap": 0,
-	"fence": readyWallElement("other/fence_long", "gaia"),
-	"fence_short": readyWallElement("other/fence_short", "gaia"),
-	"bench":     { "angle": Math.PI / 2, "length": 1.5,  "indent": 0,    "bend": 0, "templateName": "other/bench" },
+	"fence": readyWallElement("structures/fence_long", "gaia"),
+	"fence_short": readyWallElement("structures/fence_short", "gaia"),
+	"bench":     { "angle": Math.PI / 2, "length": 1.5,  "indent": 0,    "bend": 0, "templateName": "structures/bench" },
 	"sheep":     { "angle": 0,           "length": 0,    "indent": 0.75, "bend": 0, "templateName": "gaia/fauna_sheep" },
 	"foodBin":   { "angle": Math.PI / 2, "length": 1.5,  "indent": 0,    "bend": 0, "templateName": "gaia/treasure/food_bin" },
 	"farmstead": { "angle": Math.PI,     "length": 0,    "indent": -3,   "bend": 0, "templateName": "structures/brit_farmstead" }

binaries/data/mods/public/maps/random/danubius.js

@@ -65,8 +65,8 @@ const oOutpost = "structures/gaul_outpost";
 const oTemple = "uncapturable|structures/gaul_temple";
 const oTavern = "uncapturable|structures/gaul_tavern";
 const oHouse = "uncapturable|structures/gaul_house";
-const oLongHouse = "uncapturable|other/celt_longhouse";
-const oHut = "uncapturable|other/celt_hut";
+const oLongHouse = "uncapturable|structures/celt_longhouse";
+const oHut = "uncapturable|structures/celt_hut";
 const oSentryTower = "uncapturable|structures/gaul_sentry_tower";
 const oWatchTower = "uncapturable|structures/palisades_watchtower";
 

binaries/data/mods/public/maps/random/hellas_biomes.json

@@ -97,7 +97,7 @@
 			},
 			"athen": {
 				"columns": "gaia/ruins/column_doric",
-				"stoa": "other/hellenic_stoa"
+				"stoa": "structures/hellenic_stoa"
 			}
 		},
 		"actors":

binaries/data/mods/public/maps/random/island_stronghold.js

@@ -35,7 +35,7 @@ const oMetalLarge = g_Gaia.metalLarge;
 const oWhale = "gaia/fauna_whale_humpback";
 const oShipwreck = "gaia/treasure/shipwreck";
 const oShipDebris = "gaia/treasure/shipwreck_debris";
-const oObelisk = "other/obelisk";
+const oObelisk = "structures/obelisk";
 
 const aGrass = g_Decoratives.grass;
 const aGrassShort = g_Decoratives.grassShort;

binaries/data/mods/public/maps/random/rmgen-common/wall_builder.js

@@ -24,7 +24,7 @@ function loadWallsetsFromCivData()
 		for (let path of civInfo.WallSets)
 		{
 			// File naming conventions:
-			// - other/wallset_{style}
+			// - structures/wallset_{style}
 			// - structures/{civ}_wallset_{style}
 			let style = basename(path).split("_");
 			style = style[0] == "wallset" ? style[1] : style[0] + "_" + style[2];

binaries/data/mods/public/maps/random/the_nile.js

@@ -25,7 +25,7 @@ var oStoneSmall = "gaia/rock/desert_small";
 var oMetalLarge = "gaia/ore/desert_large";
 var oDatePalm = "gaia/tree/date_palm";
 var oSDatePalm = "gaia/tree/cretan_date_palm_short";
-var eObelisk = "other/obelisk";
+var eObelisk = "structures/obelisk";
 var ePyramid = "gaia/ruins/pyramid_minor";
 var oWoodTreasure = "gaia/treasure/wood";
 var oFoodTreasure = "gaia/treasure/food_bin";

binaries/data/mods/public/maps/random/wall_demo.js

@@ -107,7 +107,7 @@ for (let styleIndex in wallStyleList)
 		new Vector2D(styleIndex * buildableMapSize / wallStyleList.length, 0)
 	]);
 
-	g_Map.placeEntityPassable("other/obelisk", playerID, pos, orientation);
+	g_Map.placeEntityPassable("structures/obelisk", playerID, pos, orientation);
 	placeFortress(pos, type, style, playerID, orientation);
 }
 
@@ -135,7 +135,7 @@ for (let styleIndex in wallStyleList)
 		new Vector2D(styleIndex * buildableMapSize / wallStyleList.length, 0)
 	]);
 
-	g_Map.placeEntityPassable("other/obelisk", playerID, pos, 0);
+	g_Map.placeEntityPassable("structures/obelisk", playerID, pos, 0);
 	placeGenericFortress(pos, radius, playerID, style);
 }
 
@@ -176,7 +176,7 @@ for (let styleIndex in wallStyleList)
 	// If less than Pi * 2, then the wall will be an arc.
 	let maxAngle = Math.PI / 2 * (styleIndex % 3 + 2);
 
-	g_Map.placeEntityPassable("other/obelisk", playerID, center, orientation);
+	g_Map.placeEntityPassable("structures/obelisk", playerID, center, orientation);
 	placeCircularWall(center, radius, wallPart, style, playerID, orientation, maxAngle);
 }
 
@@ -225,7 +225,7 @@ for (let styleIndex in wallStyleList)
 	// If true, the first side will not be drawn, leaving the wall open.
 	let skipFirstWall = true;
 
-	g_Map.placeEntityPassable("other/obelisk", playerID, centerPosition, orientation);
+	g_Map.placeEntityPassable("structures/obelisk", playerID, centerPosition, orientation);
 	placePolygonalWall(centerPosition, radius, wallParts, cornerWallElement, style, playerID, orientation, numCorners, skipFirstWall);
 }
 
@@ -283,7 +283,7 @@ for (let styleIndex in wallStyleList)
 	// If true, the first side will not be drawn, leaving the wall open.
 	let skipFirstWall = true;
 
-	g_Map.placeEntityPassable("other/obelisk", playerID, centerPosition, orientation);
+	g_Map.placeEntityPassable("structures/obelisk", playerID, centerPosition, orientation);
 	placeIrregularPolygonalWall(centerPosition, radius, cornerWallElement, style, playerID, orientation, numCorners, irregularity, skipFirstWall);
 }
 

binaries/data/mods/public/maps/random/wild_lake.js

@@ -279,9 +279,9 @@ var farmEntities = {
 
 g_WallStyles.other = {
 	"overlap": 0,
-	"fence": readyWallElement("other/fence_long", "gaia"),
-	"fence_short": readyWallElement("other/fence_short", "gaia"),
-	"bench":     { "angle": Math.PI / 2, "length": 1.5,  "indent": 0,    "bend": 0, "templateName": "other/bench" },
+	"fence": readyWallElement("structures/fence_long", "gaia"),
+	"fence_short": readyWallElement("structures/fence_short", "gaia"),
+	"bench":     { "angle": Math.PI / 2, "length": 1.5,  "indent": 0,    "bend": 0, "templateName": "structures/bench" },
 	"foodBin":   { "angle": Math.PI / 2, "length": 1.5,  "indent": 0,    "bend": 0, "templateName": "gaia/treasure/food_bin" },
 	"animal":    { "angle": 0,           "length": 0,    "indent": 0.75, "bend": 0, "templateName": farmEntities[currentBiome()].animal },
 	"farmstead": { "angle": Math.PI,     "length": 0,    "indent": -3,   "bend": 0, "templateName": farmEntities[currentBiome()].building }