dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-17 13:53:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Move palisades from other/ to structures/

Browse source 
Following D1881 which introduced a common parent, palisade templates can
be moved:
 - other/palisades_rocks_* to structures/palisades_*
 - other/palisades_*_spike* to structures/palisades_spike*

Map scripts were updated accordingly.

Patch By: Nescio
Reviewed By: wraitii
Refs #4770

Differential Revision: https://code.wildfiregames.com/D2234
This was SVN commit r22982.
This commit is contained in:
wraitii 2019-09-23 07:48:00 +00:00
parent d69da4c948
commit 74897ebc2d
38 changed files with 73 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
binaries/data/mods/public/maps/random/danubius.js
View file

@ -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";

2
binaries/data/mods/public/maps/random/extinct_volcano.js
View file

@ -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";

6
binaries/data/mods/public/maps/random/jebel_barkal.js
View file

@ -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";

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

@ -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;

4
binaries/data/mods/public/maps/scenarios/Azure Coast(2).xml
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:13063525a36dfc36daed7fd1ffd514034379aa5be57d61bb10861cb2d3162ff4
size 1544895
oid sha256:cb0bcfba98ee7b80925a743b10c26875e37e697ad86cb249333eb5bdfa7f619c
size 1544957

4
binaries/data/mods/public/maps/scenarios/Azure Coast(4).xml
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e3eb84bf4161f8a6093fb11c3ffbee6546a2ac31a3ce600756f2c40318be911a
size 1545189
oid sha256:432985c4f48e8bcf11bd6a7fb5129ca414697db769a37fc87ea46cacf4fb14bd
size 1545251

4
binaries/data/mods/public/maps/scenarios/Azure Coast.xml
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c626c3db3211f4ccdb74a81e90bdd26326252806b6c707632a80d2b5d7f84743
size 1547904
oid sha256:30077cee5a47139fc0a1723a405105f41a1c94b18996dbe19ba48ffbf304b8ba
size 1547966

4
binaries/data/mods/public/maps/scenarios/Sandbox - Britons.xml
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:87f1889b794155af2cf4cfe37b22d8d113ecf3ff8e017dbaac564bc9156302bc
size 682517
oid sha256:1dcc81ee9e346033cdccaeb8a36ee292c35e9b13c00464d174f3546b9c299b83
size 683314

4
binaries/data/mods/public/maps/scenarios/Sandbox - Gauls.xml
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:15697fbecf5aed72db53f7e26fbc1383eb47076bd1676efd7d7ae966a3fc070c
size 684116
oid sha256:48c99209b982a76f40717282e0260020bd06fbcef2390cd8adb52eace7c8e612
size 684918

4
binaries/data/mods/public/maps/scenarios/Sandbox - Persians.xml
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3dc51bfce947d15c4313b39008cdaa2e17752a61740bbc740f8e67f270b8c158
size 262774
oid sha256:e51ee734026825e7ca61e34552cadc9ec9a29bb1114dab7d2ca23d40620aa34f
size 262770

4
binaries/data/mods/public/maps/scenarios/Third Macedonian War.xml
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:38044e0fe3371e242242bbdbdd546eb0f2690654ed514ef9f8cbf801532631cd
size 201552
oid sha256:2bf35aba74f3deccb7b679213849fc7daa2d201f3059ee6e051524feb6c330e7
size 201518

4
binaries/data/mods/public/maps/scenarios/WallTest.xml
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9231146993f5018e7548cad47bf8e92e3b0b93788af721fbf33c230d89705f36
size 4999
oid sha256:c0c539bd1111891e88243199b604710dd46075561afae96972aac61166fe1ad5
size 4995

40
binaries/data/mods/public/maps/scenarios/unit_motion_integration_test.js
View file

@ -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");

4
binaries/data/mods/public/maps/skirmishes/Alpine_Mountains_(3).xml
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3e13d04f382abb415cb4cd8da219454a1f6ed375e6f9f1fad4ae276101bce19e
size 648801
oid sha256:f841491f673ed674b14872863d960f3861d1bc6d8a51b7d759d5a037bdb78878
size 648790

4
binaries/data/mods/public/maps/skirmishes/Corinthian Isthmus (4).xml
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6398435aac9c3eab313caafef17994a2389948334ca2e5191a5f63ed11a78395
size 1776800
oid sha256:769432d03ed41043f760bd03c9073bdf59d49e8ac9169a6c86a9ba740aa63967
size 1776767

4
binaries/data/mods/public/maps/skirmishes/Forest Battle (4).xml
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1cd626c44f045625ffb22c2c705b424dfbd060ec5363f188dd5c6b75c320b244
size 519536
oid sha256:7a392ad628025b79b95bacc5abcf49d718dfff0547ec4f459d324e0af45ce08d
size 519486

4
binaries/data/mods/public/maps/skirmishes/Gallic Fields (3).xml
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:503a25643fa05d6bd5952ed6d7822581024602b71d73ef454980d4a330b02521
size 657668
oid sha256:e03b3c08a6e0f99a38dfcd714ad3abbe54ebfa8f0e912b4644487d8055dd2e5e
size 658430

4
binaries/data/mods/public/maps/skirmishes/Via Augusta (4).xml
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:489705c7ced2b3a54c1c911358e47ec3f815d0acf46f952ee5a28c62cb54bc25
size 427773
oid sha256:363240f1d25bdf13961625e72b6b38a729279f967a3d0491897e0eaf3ff42a0c
size 427883

2
binaries/data/mods/public/simulation/templates/structures/cart_s_wall_gate.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="other/palisades_rocks_gate">
<Entity parent="structures/palisades_gate">
<Identity>
<Civ>cart</Civ>
</Identity>

2
binaries/data/mods/public/simulation/templates/structures/cart_s_wall_long.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="other/palisades_rocks_long">
<Entity parent="structures/palisades_long">
<Identity>
<Civ>cart</Civ>
<SelectionGroupName>structures/cart_wallset_short</SelectionGroupName>

2
binaries/data/mods/public/simulation/templates/structures/cart_s_wall_medium.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="other/palisades_rocks_medium">
<Entity parent="structures/palisades_medium">
<Identity>
<Civ>cart</Civ>
<SelectionGroupName>structures/cart_wallset_short</SelectionGroupName>

2
binaries/data/mods/public/simulation/templates/structures/cart_s_wall_short.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="other/palisades_rocks_short">
<Entity parent="structures/palisades_short">
<Identity>
<Civ>cart</Civ>
<SelectionGroupName>structures/cart_wallset_short</SelectionGroupName>

2
binaries/data/mods/public/simulation/templates/structures/cart_s_wall_tower.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="other/palisades_rocks_tower">
<Entity parent="structures/palisades_tower">
<Identity>
<Civ>cart</Civ>
<SelectionGroupName>structures/cart_wallset_short</SelectionGroupName>

0
binaries/data/mods/public/simulation/templates/other/palisades_rocks_curve.xml → binaries/data/mods/public/simulation/templates/structures/palisades_curve.xml
View file

0
binaries/data/mods/public/simulation/templates/other/palisades_rocks_end.xml → binaries/data/mods/public/simulation/templates/structures/palisades_end.xml
View file

0
binaries/data/mods/public/simulation/templates/other/palisades_rocks_fort.xml → binaries/data/mods/public/simulation/templates/structures/palisades_fort.xml
View file

0
binaries/data/mods/public/simulation/templates/other/palisades_rocks_gate.xml → binaries/data/mods/public/simulation/templates/structures/palisades_gate.xml
View file

0
binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml → binaries/data/mods/public/simulation/templates/structures/palisades_long.xml
View file

0
binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml → binaries/data/mods/public/simulation/templates/structures/palisades_medium.xml
View file

0
binaries/data/mods/public/simulation/templates/other/palisades_rocks_outpost.xml → binaries/data/mods/public/simulation/templates/structures/palisades_outpost.xml
View file

0
binaries/data/mods/public/simulation/templates/other/palisades_rocks_short.xml → binaries/data/mods/public/simulation/templates/structures/palisades_short.xml
View file

0
binaries/data/mods/public/simulation/templates/other/palisades_angle_spike.xml → binaries/data/mods/public/simulation/templates/structures/palisades_spike_angle.xml
View file

0
binaries/data/mods/public/simulation/templates/other/palisades_small_spikes.xml → binaries/data/mods/public/simulation/templates/structures/palisades_spikes_small.xml
View file

0
binaries/data/mods/public/simulation/templates/other/palisades_tall_spikes.xml → binaries/data/mods/public/simulation/templates/structures/palisades_spikes_tall.xml
View file

0
binaries/data/mods/public/simulation/templates/other/palisades_rocks_straight.xml → binaries/data/mods/public/simulation/templates/structures/palisades_straight.xml
View file

0
binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml → binaries/data/mods/public/simulation/templates/structures/palisades_tower.xml
View file

0
binaries/data/mods/public/simulation/templates/other/palisades_rocks_watchtower.xml → binaries/data/mods/public/simulation/templates/structures/palisades_watchtower.xml
View file

18
binaries/data/mods/public/simulation/templates/structures/wallset_palisade.xml
View file

@ -9,16 +9,14 @@
</Identity>
<WallSet>
<Templates>
<Tower>other/palisades_rocks_tower</Tower>
<Gate>other/palisades_rocks_gate</Gate>
<Fort>other/palisades_rocks_fort</Fort>
<WallLong>other/palisades_rocks_long</WallLong>
<WallMedium>other/palisades_rocks_medium</WallMedium>
<WallShort>other/palisades_rocks_short</WallShort>
<WallCurves>
other/palisades_rocks_curve
</WallCurves>
<WallEnd>other/palisades_rocks_end</WallEnd>
<Tower>structures/palisades_tower</Tower>
<Gate>structures/palisades_gate</Gate>
<Fort>structures/palisades_fort</Fort>
<WallLong>structures/palisades_long</WallLong>
<WallMedium>structures/palisades_medium</WallMedium>
<WallShort>structures/palisades_short</WallShort>
<WallCurves>structures/palisades_curve</WallCurves>
<WallEnd>structures/palisades_end</WallEnd>
</Templates>
</WallSet>
</Entity>