diff --git a/binaries/data/mods/public/maps/random/danubius.js b/binaries/data/mods/public/maps/random/danubius.js index 66981ced55..6e7bd88fe2 100644 --- a/binaries/data/mods/public/maps/random/danubius.js +++ b/binaries/data/mods/public/maps/random/danubius.js @@ -66,16 +66,16 @@ const oHouse = "uncapturable|structures/gaul_house"; const oLongHouse = "uncapturable|other/celt_longhouse"; const oHut = "uncapturable|other/celt_hut"; const oSentryTower = "uncapturable|structures/gaul_sentry_tower"; -const oWatchTower = "uncapturable|other/palisades_rocks_watchtower"; +const oWatchTower = "uncapturable|structures/palisades_watchtower"; -const oPalisadeTallSpikes = "uncapturable|other/palisades_tall_spikes"; -const oPalisadeAngleSpikes = "uncapturable|other/palisades_angle_spike"; -const oPalisadeCurve = "uncapturable|other/palisades_rocks_curve"; -const oPalisadeShort = "uncapturable|other/palisades_rocks_short"; -const oPalisadeMedium = "uncapturable|other/palisades_rocks_medium"; -const oPalisadeLong = "uncapturable|other/palisades_rocks_long"; -const oPalisadeGate = "uncapturable|other/palisades_rocks_gate"; -const oPalisadePillar = "uncapturable|other/palisades_rocks_tower"; +const oPalisadeTallSpikes = "uncapturable|structures/palisades_spikes_tall"; +const oPalisadeAngleSpikes = "uncapturable|structures/palisades_spike_angle"; +const oPalisadeCurve = "uncapturable|structures/palisades_curve"; +const oPalisadeShort = "uncapturable|structures/palisades_short"; +const oPalisadeMedium = "uncapturable|structures/palisades_medium"; +const oPalisadeLong = "uncapturable|structures/palisades_long"; +const oPalisadeGate = "uncapturable|structures/palisades_gate"; +const oPalisadePillar = "uncapturable|structures/palisades_tower"; const oFemale = "units/gaul_support_female_citizen"; const oHealer = "units/gaul_support_healer_b"; diff --git a/binaries/data/mods/public/maps/random/extinct_volcano.js b/binaries/data/mods/public/maps/random/extinct_volcano.js index 526f62c7a5..c38d2120fe 100644 --- a/binaries/data/mods/public/maps/random/extinct_volcano.js +++ b/binaries/data/mods/public/maps/random/extinct_volcano.js @@ -29,7 +29,7 @@ const oBear = "gaia/fauna_bear"; const oStoneLarge = "gaia/geology_stonemine_temperate_quarry"; const oStoneSmall = "gaia/geology_stone_temperate"; const oMetalLarge = "gaia/geology_metal_temperate_slabs"; -const oTower = "other/palisades_rocks_fort"; +const oTower = "structures/palisades_fort"; const aRockLarge = "actor|geology/stone_granite_med.xml"; const aRockMedium = "actor|geology/stone_granite_med.xml"; diff --git a/binaries/data/mods/public/maps/random/jebel_barkal.js b/binaries/data/mods/public/maps/random/jebel_barkal.js index 7a01f88401..2df78b9ad6 100644 --- a/binaries/data/mods/public/maps/random/jebel_barkal.js +++ b/binaries/data/mods/public/maps/random/jebel_barkal.js @@ -81,9 +81,9 @@ const oElephantStables = "structures/kush_elephant_stables"; const oWallMedium = "structures/kush_wall_medium"; const oWallGate = "structures/kush_wall_gate"; const oWallTower = "structures/kush_wall_tower"; -const oPalisadeMedium = "other/palisades_rocks_medium"; -const oPalisadeGate = "other/palisades_rocks_gate"; -const oPalisadeTower = "other/palisades_rocks_tower"; +const oPalisadeMedium = "structures/palisades_medium"; +const oPalisadeGate = "structures/palisades_gate"; +const oPalisadeTower = "structures/palisades_tower"; const oKushCitizenArcher = "units/kush_infantry_archer_b"; const oKushHealer = "units/kush_support_healer_b"; const oKushChampionArcher = "units/kush_champion_infantry"; diff --git a/binaries/data/mods/public/maps/random/rmgen-common/wall_builder.js b/binaries/data/mods/public/maps/random/rmgen-common/wall_builder.js index 34cd7a01c4..057b31aaa9 100644 --- a/binaries/data/mods/public/maps/random/rmgen-common/wall_builder.js +++ b/binaries/data/mods/public/maps/random/rmgen-common/wall_builder.js @@ -193,7 +193,7 @@ function getWallElement(element, style) break; case "entryTower": - ret.templateName = g_CivData[civ] ? "structures/" + civ + "_defense_tower" : "other/palisades_rocks_watchtower"; + ret.templateName = g_CivData[civ] ? "structures/" + civ + "_defense_tower" : "structures/palisades_watchtower"; ret.indent = ret.length * -3; ret.length = wallset.gate.length; break; diff --git a/binaries/data/mods/public/maps/scenarios/Azure Coast(2).xml b/binaries/data/mods/public/maps/scenarios/Azure Coast(2).xml index 372406449f..4126f52641 100644 --- a/binaries/data/mods/public/maps/scenarios/Azure Coast(2).xml +++ b/binaries/data/mods/public/maps/scenarios/Azure Coast(2).xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:13063525a36dfc36daed7fd1ffd514034379aa5be57d61bb10861cb2d3162ff4 -size 1544895 +oid sha256:cb0bcfba98ee7b80925a743b10c26875e37e697ad86cb249333eb5bdfa7f619c +size 1544957 diff --git a/binaries/data/mods/public/maps/scenarios/Azure Coast(4).xml b/binaries/data/mods/public/maps/scenarios/Azure Coast(4).xml index bc61b38043..5e6ca17620 100644 --- a/binaries/data/mods/public/maps/scenarios/Azure Coast(4).xml +++ b/binaries/data/mods/public/maps/scenarios/Azure Coast(4).xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3eb84bf4161f8a6093fb11c3ffbee6546a2ac31a3ce600756f2c40318be911a -size 1545189 +oid sha256:432985c4f48e8bcf11bd6a7fb5129ca414697db769a37fc87ea46cacf4fb14bd +size 1545251 diff --git a/binaries/data/mods/public/maps/scenarios/Azure Coast.xml b/binaries/data/mods/public/maps/scenarios/Azure Coast.xml index 19d075870e..8348db4712 100644 --- a/binaries/data/mods/public/maps/scenarios/Azure Coast.xml +++ b/binaries/data/mods/public/maps/scenarios/Azure Coast.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c626c3db3211f4ccdb74a81e90bdd26326252806b6c707632a80d2b5d7f84743 -size 1547904 +oid sha256:30077cee5a47139fc0a1723a405105f41a1c94b18996dbe19ba48ffbf304b8ba +size 1547966 diff --git a/binaries/data/mods/public/maps/scenarios/Sandbox - Britons.xml b/binaries/data/mods/public/maps/scenarios/Sandbox - Britons.xml index be3e650e0d..477f465597 100644 --- a/binaries/data/mods/public/maps/scenarios/Sandbox - Britons.xml +++ b/binaries/data/mods/public/maps/scenarios/Sandbox - Britons.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87f1889b794155af2cf4cfe37b22d8d113ecf3ff8e017dbaac564bc9156302bc -size 682517 +oid sha256:1dcc81ee9e346033cdccaeb8a36ee292c35e9b13c00464d174f3546b9c299b83 +size 683314 diff --git a/binaries/data/mods/public/maps/scenarios/Sandbox - Gauls.xml b/binaries/data/mods/public/maps/scenarios/Sandbox - Gauls.xml index 804c5364fb..ab55aea7e9 100644 --- a/binaries/data/mods/public/maps/scenarios/Sandbox - Gauls.xml +++ b/binaries/data/mods/public/maps/scenarios/Sandbox - Gauls.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15697fbecf5aed72db53f7e26fbc1383eb47076bd1676efd7d7ae966a3fc070c -size 684116 +oid sha256:48c99209b982a76f40717282e0260020bd06fbcef2390cd8adb52eace7c8e612 +size 684918 diff --git a/binaries/data/mods/public/maps/scenarios/Sandbox - Persians.xml b/binaries/data/mods/public/maps/scenarios/Sandbox - Persians.xml index 671d8a60fe..779cfa42e6 100644 --- a/binaries/data/mods/public/maps/scenarios/Sandbox - Persians.xml +++ b/binaries/data/mods/public/maps/scenarios/Sandbox - Persians.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3dc51bfce947d15c4313b39008cdaa2e17752a61740bbc740f8e67f270b8c158 -size 262774 +oid sha256:e51ee734026825e7ca61e34552cadc9ec9a29bb1114dab7d2ca23d40620aa34f +size 262770 diff --git a/binaries/data/mods/public/maps/scenarios/Third Macedonian War.xml b/binaries/data/mods/public/maps/scenarios/Third Macedonian War.xml index d03594866c..a3c136520c 100644 --- a/binaries/data/mods/public/maps/scenarios/Third Macedonian War.xml +++ b/binaries/data/mods/public/maps/scenarios/Third Macedonian War.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:38044e0fe3371e242242bbdbdd546eb0f2690654ed514ef9f8cbf801532631cd -size 201552 +oid sha256:2bf35aba74f3deccb7b679213849fc7daa2d201f3059ee6e051524feb6c330e7 +size 201518 diff --git a/binaries/data/mods/public/maps/scenarios/WallTest.xml b/binaries/data/mods/public/maps/scenarios/WallTest.xml index a96a14a733..c8b103a5cf 100644 --- a/binaries/data/mods/public/maps/scenarios/WallTest.xml +++ b/binaries/data/mods/public/maps/scenarios/WallTest.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9231146993f5018e7548cad47bf8e92e3b0b93788af721fbf33c230d89705f36 -size 4999 +oid sha256:c0c539bd1111891e88243199b604710dd46075561afae96972aac61166fe1ad5 +size 4995 diff --git a/binaries/data/mods/public/maps/scenarios/unit_motion_integration_test.js b/binaries/data/mods/public/maps/scenarios/unit_motion_integration_test.js index fd43f756cb..1c9c0fac91 100755 --- a/binaries/data/mods/public/maps/scenarios/unit_motion_integration_test.js +++ b/binaries/data/mods/public/maps/scenarios/unit_motion_integration_test.js @@ -158,20 +158,20 @@ experiments.units_running_into_eachother = { experiments.enclosed = { "spawn": () => { - QuickSpawn(gx, gy - 8, "other/palisades_rocks_long"); - QuickSpawn(gx, gy + 8, "other/palisades_rocks_long"); - Rotate(Math.PI / 2, QuickSpawn(gx - 8, gy, "other/palisades_rocks_long")); - Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy, "other/palisades_rocks_long")); + QuickSpawn(gx, gy - 8, "structures/palisades_long"); + QuickSpawn(gx, gy + 8, "structures/palisades_long"); + Rotate(Math.PI / 2, QuickSpawn(gx - 8, gy, "structures/palisades_long")); + Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy, "structures/palisades_long")); WalkTo(gx + 100, gy + 100, QuickSpawn(gx - 1, gy - 1, UNIT_TEMPLATE)); WalkTo(gx - 100, gy + 100, QuickSpawn(gx + 1, gy - 1, UNIT_TEMPLATE)); WalkTo(gx - 100, gy - 100, QuickSpawn(gx + 1, gy + 1, UNIT_TEMPLATE)); WalkTo(gx + 100, gy - 100, QuickSpawn(gx - 1, gy + 1, UNIT_TEMPLATE)); - QuickSpawn(gx, gy + 20, "other/palisades_rocks_long"); - experiments.enclosed.remove = QuickSpawn(gx, gy + 36, "other/palisades_rocks_long"); - Rotate(Math.PI / 2, QuickSpawn(gx - 8, gy + 28, "other/palisades_rocks_long")); - Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy + 28, "other/palisades_rocks_long")); + QuickSpawn(gx, gy + 20, "structures/palisades_long"); + experiments.enclosed.remove = QuickSpawn(gx, gy + 36, "structures/palisades_long"); + Rotate(Math.PI / 2, QuickSpawn(gx - 8, gy + 28, "structures/palisades_long")); + Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy + 28, "structures/palisades_long")); WalkTo(gx, gy + 100, QuickSpawn(gx, gy + 28, UNIT_TEMPLATE)); }, @@ -221,18 +221,18 @@ experiments.units_superdense_forest_of_units = { experiments.u_shape_tight_exit = { "spawn": () => { - Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy, "other/palisades_rocks_long")); - Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy + 12, "other/palisades_rocks_long")); - QuickSpawn(gx, gy + 16, "other/palisades_rocks_long"); - Rotate(Math.PI / 2, QuickSpawn(gx, gy + 4, "other/palisades_rocks_medium")); - Rotate(Math.PI / 2, QuickSpawn(gx - 8, gy + 12, "other/palisades_rocks_long")); - Rotate(Math.PI / 2, QuickSpawn(gx - 16, gy + 8, "other/palisades_rocks_long")); - QuickSpawn(gx - 4, gy, "other/palisades_rocks_medium"); - QuickSpawn(gx - 12, gy, "other/palisades_rocks_medium"); - Rotate(Math.PI/4, QuickSpawn(gx - 10, gy + 8, "other/palisades_rocks_short")); - QuickSpawn(gx, gy - 10, "other/palisades_rocks_long"); - Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy - 5, "other/palisades_rocks_long")); - Rotate(Math.PI / 2, QuickSpawn(gx - 8, gy - 7, "other/palisades_rocks_long")); + Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy, "structures/palisades_long")); + Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy + 12, "structures/palisades_long")); + QuickSpawn(gx, gy + 16, "structures/palisades_long"); + Rotate(Math.PI / 2, QuickSpawn(gx, gy + 4, "structures/palisades_medium")); + Rotate(Math.PI / 2, QuickSpawn(gx - 8, gy + 12, "structures/palisades_long")); + Rotate(Math.PI / 2, QuickSpawn(gx - 16, gy + 8, "structures/palisades_long")); + QuickSpawn(gx - 4, gy, "structures/palisades_medium"); + QuickSpawn(gx - 12, gy, "structures/palisades_medium"); + Rotate(Math.PI/4, QuickSpawn(gx - 10, gy + 8, "structures/palisades_short")); + QuickSpawn(gx, gy - 10, "structures/palisades_long"); + Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy - 5, "structures/palisades_long")); + Rotate(Math.PI / 2, QuickSpawn(gx - 8, gy - 7, "structures/palisades_long")); let tree = QuickSpawn(gx, gy + 80, "gaia/flora_tree_acacia"); diff --git a/binaries/data/mods/public/maps/skirmishes/Alpine_Mountains_(3).xml b/binaries/data/mods/public/maps/skirmishes/Alpine_Mountains_(3).xml index b4161e6420..4005b9eb16 100644 --- a/binaries/data/mods/public/maps/skirmishes/Alpine_Mountains_(3).xml +++ b/binaries/data/mods/public/maps/skirmishes/Alpine_Mountains_(3).xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e13d04f382abb415cb4cd8da219454a1f6ed375e6f9f1fad4ae276101bce19e -size 648801 +oid sha256:f841491f673ed674b14872863d960f3861d1bc6d8a51b7d759d5a037bdb78878 +size 648790 diff --git a/binaries/data/mods/public/maps/skirmishes/Corinthian Isthmus (4).xml b/binaries/data/mods/public/maps/skirmishes/Corinthian Isthmus (4).xml index 482d11fff5..b99ac4172c 100644 --- a/binaries/data/mods/public/maps/skirmishes/Corinthian Isthmus (4).xml +++ b/binaries/data/mods/public/maps/skirmishes/Corinthian Isthmus (4).xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6398435aac9c3eab313caafef17994a2389948334ca2e5191a5f63ed11a78395 -size 1776800 +oid sha256:769432d03ed41043f760bd03c9073bdf59d49e8ac9169a6c86a9ba740aa63967 +size 1776767 diff --git a/binaries/data/mods/public/maps/skirmishes/Forest Battle (4).xml b/binaries/data/mods/public/maps/skirmishes/Forest Battle (4).xml index 77838aafbc..bbc24320a3 100644 --- a/binaries/data/mods/public/maps/skirmishes/Forest Battle (4).xml +++ b/binaries/data/mods/public/maps/skirmishes/Forest Battle (4).xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1cd626c44f045625ffb22c2c705b424dfbd060ec5363f188dd5c6b75c320b244 -size 519536 +oid sha256:7a392ad628025b79b95bacc5abcf49d718dfff0547ec4f459d324e0af45ce08d +size 519486 diff --git a/binaries/data/mods/public/maps/skirmishes/Gallic Fields (3).xml b/binaries/data/mods/public/maps/skirmishes/Gallic Fields (3).xml index db6b7524f2..2da404318e 100644 --- a/binaries/data/mods/public/maps/skirmishes/Gallic Fields (3).xml +++ b/binaries/data/mods/public/maps/skirmishes/Gallic Fields (3).xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:503a25643fa05d6bd5952ed6d7822581024602b71d73ef454980d4a330b02521 -size 657668 +oid sha256:e03b3c08a6e0f99a38dfcd714ad3abbe54ebfa8f0e912b4644487d8055dd2e5e +size 658430 diff --git a/binaries/data/mods/public/maps/skirmishes/Via Augusta (4).xml b/binaries/data/mods/public/maps/skirmishes/Via Augusta (4).xml index 03adc3a17b..4d8a4a7a10 100644 --- a/binaries/data/mods/public/maps/skirmishes/Via Augusta (4).xml +++ b/binaries/data/mods/public/maps/skirmishes/Via Augusta (4).xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:489705c7ced2b3a54c1c911358e47ec3f815d0acf46f952ee5a28c62cb54bc25 -size 427773 +oid sha256:363240f1d25bdf13961625e72b6b38a729279f967a3d0491897e0eaf3ff42a0c +size 427883 diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_gate.xml b/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_gate.xml index 9342a8eb8e..96fc76548f 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_gate.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_gate.xml @@ -1,5 +1,5 @@ - + cart diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_long.xml b/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_long.xml index c9cb786bd1..813c5a0af7 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_long.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_long.xml @@ -1,5 +1,5 @@ - + cart structures/cart_wallset_short diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_medium.xml b/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_medium.xml index 92be53d63b..f767b05a7b 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_medium.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_medium.xml @@ -1,5 +1,5 @@ - + cart structures/cart_wallset_short diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_short.xml b/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_short.xml index 0385d607d6..03c8481f07 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_short.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_short.xml @@ -1,5 +1,5 @@ - + cart structures/cart_wallset_short diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_tower.xml b/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_tower.xml index 9fc5893136..abdb80ba25 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_tower.xml @@ -1,5 +1,5 @@ - + cart structures/cart_wallset_short diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_curve.xml b/binaries/data/mods/public/simulation/templates/structures/palisades_curve.xml similarity index 100% rename from binaries/data/mods/public/simulation/templates/other/palisades_rocks_curve.xml rename to binaries/data/mods/public/simulation/templates/structures/palisades_curve.xml diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_end.xml b/binaries/data/mods/public/simulation/templates/structures/palisades_end.xml similarity index 100% rename from binaries/data/mods/public/simulation/templates/other/palisades_rocks_end.xml rename to binaries/data/mods/public/simulation/templates/structures/palisades_end.xml diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_fort.xml b/binaries/data/mods/public/simulation/templates/structures/palisades_fort.xml similarity index 100% rename from binaries/data/mods/public/simulation/templates/other/palisades_rocks_fort.xml rename to binaries/data/mods/public/simulation/templates/structures/palisades_fort.xml diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_gate.xml b/binaries/data/mods/public/simulation/templates/structures/palisades_gate.xml similarity index 100% rename from binaries/data/mods/public/simulation/templates/other/palisades_rocks_gate.xml rename to binaries/data/mods/public/simulation/templates/structures/palisades_gate.xml diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml b/binaries/data/mods/public/simulation/templates/structures/palisades_long.xml similarity index 100% rename from binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml rename to binaries/data/mods/public/simulation/templates/structures/palisades_long.xml diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml b/binaries/data/mods/public/simulation/templates/structures/palisades_medium.xml similarity index 100% rename from binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml rename to binaries/data/mods/public/simulation/templates/structures/palisades_medium.xml diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_outpost.xml b/binaries/data/mods/public/simulation/templates/structures/palisades_outpost.xml similarity index 100% rename from binaries/data/mods/public/simulation/templates/other/palisades_rocks_outpost.xml rename to binaries/data/mods/public/simulation/templates/structures/palisades_outpost.xml diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_short.xml b/binaries/data/mods/public/simulation/templates/structures/palisades_short.xml similarity index 100% rename from binaries/data/mods/public/simulation/templates/other/palisades_rocks_short.xml rename to binaries/data/mods/public/simulation/templates/structures/palisades_short.xml diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_angle_spike.xml b/binaries/data/mods/public/simulation/templates/structures/palisades_spike_angle.xml similarity index 100% rename from binaries/data/mods/public/simulation/templates/other/palisades_angle_spike.xml rename to binaries/data/mods/public/simulation/templates/structures/palisades_spike_angle.xml diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_small_spikes.xml b/binaries/data/mods/public/simulation/templates/structures/palisades_spikes_small.xml similarity index 100% rename from binaries/data/mods/public/simulation/templates/other/palisades_small_spikes.xml rename to binaries/data/mods/public/simulation/templates/structures/palisades_spikes_small.xml diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_tall_spikes.xml b/binaries/data/mods/public/simulation/templates/structures/palisades_spikes_tall.xml similarity index 100% rename from binaries/data/mods/public/simulation/templates/other/palisades_tall_spikes.xml rename to binaries/data/mods/public/simulation/templates/structures/palisades_spikes_tall.xml diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_straight.xml b/binaries/data/mods/public/simulation/templates/structures/palisades_straight.xml similarity index 100% rename from binaries/data/mods/public/simulation/templates/other/palisades_rocks_straight.xml rename to binaries/data/mods/public/simulation/templates/structures/palisades_straight.xml diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml b/binaries/data/mods/public/simulation/templates/structures/palisades_tower.xml similarity index 100% rename from binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml rename to binaries/data/mods/public/simulation/templates/structures/palisades_tower.xml diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_watchtower.xml b/binaries/data/mods/public/simulation/templates/structures/palisades_watchtower.xml similarity index 100% rename from binaries/data/mods/public/simulation/templates/other/palisades_rocks_watchtower.xml rename to binaries/data/mods/public/simulation/templates/structures/palisades_watchtower.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/wallset_palisade.xml b/binaries/data/mods/public/simulation/templates/structures/wallset_palisade.xml index 24cf5fee9a..722094d1d9 100644 --- a/binaries/data/mods/public/simulation/templates/structures/wallset_palisade.xml +++ b/binaries/data/mods/public/simulation/templates/structures/wallset_palisade.xml @@ -9,16 +9,14 @@ - other/palisades_rocks_tower - other/palisades_rocks_gate - other/palisades_rocks_fort - other/palisades_rocks_long - other/palisades_rocks_medium - other/palisades_rocks_short - - other/palisades_rocks_curve - - other/palisades_rocks_end + structures/palisades_tower + structures/palisades_gate + structures/palisades_fort + structures/palisades_long + structures/palisades_medium + structures/palisades_short + structures/palisades_curve + structures/palisades_end