From 800662ec63e02546b56dca99da6aaeaacaf09576 Mon Sep 17 00:00:00 2001 From: fatherbushido Date: Sat, 9 Jul 2016 21:50:25 +0000 Subject: [PATCH] Walls templates cleanup. Use relative templates for Health. Let gates inherit the long wall template instead of the defensive structure template to reduce redundancy / duplicate entries. Remove unused costs as gate is a wall upgrade. Let a non zero cost build time to gate to fix infinite repair rate, ref #3707, #3811. This was SVN commit r18502. --- .../templates/other/palisades_rocks_gate.xml | 9 +---- .../templates/other/palisades_rocks_long.xml | 2 +- .../other/palisades_rocks_medium.xml | 4 +- .../templates/other/palisades_rocks_short.xml | 4 +- .../templates/other/palisades_rocks_tower.xml | 2 +- .../templates/structures/brit_wall_gate.xml | 7 ---- .../templates/structures/brit_wall_medium.xml | 3 -- .../templates/structures/brit_wall_short.xml | 3 -- .../templates/structures/cart_wall.xml | 9 ----- .../templates/structures/gaul_wall_gate.xml | 7 ---- .../templates/structures/gaul_wall_medium.xml | 3 -- .../templates/structures/gaul_wall_short.xml | 3 -- .../templates/structures/iber_wall_medium.xml | 3 -- .../templates/structures/iber_wall_short.xml | 3 -- .../templates/structures/ptol_wall_gate.xml | 1 - .../templates/structures/ptol_wall_long.xml | 1 + .../templates/structures/ptol_wall_medium.xml | 1 + .../templates/structures/ptol_wall_short.xml | 1 + .../structures/rome_siege_wall_gate.xml | 8 +--- .../structures/rome_siege_wall_long.xml | 2 +- .../structures/rome_siege_wall_medium.xml | 2 +- .../structures/rome_siege_wall_short.xml | 2 +- .../structures/rome_siege_wall_tower.xml | 2 +- .../templates/structures/rome_wall_medium.xml | 3 -- .../templates/structures/rome_wall_short.xml | 3 -- .../structures/spart_wall_medium.xml | 3 -- .../templates/structures/spart_wall_short.xml | 3 -- .../template_structure_defense_wall_gate.xml | 39 +++---------------- 28 files changed, 21 insertions(+), 112 deletions(-) diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_gate.xml b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_gate.xml index 5d3c18d718..1a93b45d2b 100644 --- a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_gate.xml +++ b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_gate.xml @@ -5,19 +5,12 @@ 25.0 2.0 - - 15 - - 30 - 0 - - 9.0 - 600 + 0.25 rubble/rubble_1x3pal diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml index 8e1a7f3b49..061d105b04 100644 --- a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml +++ b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml @@ -18,7 +18,7 @@ - 600 + 0.25 rubble/rubble_1x3pal diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml index a35089bcb3..4fc625c4cd 100644 --- a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml +++ b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml @@ -1,5 +1,5 @@ - + 4.0 25.0 @@ -18,7 +18,7 @@ - 500 + 0.25 rubble/rubble_1x3pal diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_short.xml b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_short.xml index 00dc0dacdd..ed4d016f56 100644 --- a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_short.xml +++ b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_short.xml @@ -1,5 +1,5 @@ - + 4.0 25.0 @@ -17,7 +17,7 @@ 9.0 - 400 + 0.25 rubble/rubble_1x1pal diff --git a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml index 175081f732..8444231306 100644 --- a/binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml +++ b/binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml @@ -17,7 +17,7 @@ 9.0 - 400 + 0.25 rubble/rubble_1x1pal diff --git a/binaries/data/mods/public/simulation/templates/structures/brit_wall_gate.xml b/binaries/data/mods/public/simulation/templates/structures/brit_wall_gate.xml index 6183b4cbf7..14f5156336 100644 --- a/binaries/data/mods/public/simulation/templates/structures/brit_wall_gate.xml +++ b/binaries/data/mods/public/simulation/templates/structures/brit_wall_gate.xml @@ -1,12 +1,5 @@ - - 30 - - 40 - 40 - - 9.0 diff --git a/binaries/data/mods/public/simulation/templates/structures/brit_wall_medium.xml b/binaries/data/mods/public/simulation/templates/structures/brit_wall_medium.xml index 51d3edfe44..1f867ff0d1 100644 --- a/binaries/data/mods/public/simulation/templates/structures/brit_wall_medium.xml +++ b/binaries/data/mods/public/simulation/templates/structures/brit_wall_medium.xml @@ -17,9 +17,6 @@ - - 3000 - brit structures/brit_wallset_stone diff --git a/binaries/data/mods/public/simulation/templates/structures/brit_wall_short.xml b/binaries/data/mods/public/simulation/templates/structures/brit_wall_short.xml index 1979e14d8e..da2e9ca9b0 100644 --- a/binaries/data/mods/public/simulation/templates/structures/brit_wall_short.xml +++ b/binaries/data/mods/public/simulation/templates/structures/brit_wall_short.xml @@ -4,9 +4,6 @@ 9.0 - - 3000 - brit structures/brit_wallset_stone diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_wall.xml b/binaries/data/mods/public/simulation/templates/structures/cart_wall.xml index 179781e49f..b6a7408dab 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_wall.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_wall.xml @@ -1,18 +1,9 @@ - - 60 - - 100 - - 9.0 - - 9000 - cart Jdar diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul_wall_gate.xml b/binaries/data/mods/public/simulation/templates/structures/gaul_wall_gate.xml index c49529a23b..ecd56ceeb3 100644 --- a/binaries/data/mods/public/simulation/templates/structures/gaul_wall_gate.xml +++ b/binaries/data/mods/public/simulation/templates/structures/gaul_wall_gate.xml @@ -1,12 +1,5 @@ - - 30 - - 40 - 40 - - 9.0 diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul_wall_medium.xml b/binaries/data/mods/public/simulation/templates/structures/gaul_wall_medium.xml index 8ea8aaf22e..2f42bff769 100644 --- a/binaries/data/mods/public/simulation/templates/structures/gaul_wall_medium.xml +++ b/binaries/data/mods/public/simulation/templates/structures/gaul_wall_medium.xml @@ -4,9 +4,6 @@ 9.0 - - 3000 - diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul_wall_short.xml b/binaries/data/mods/public/simulation/templates/structures/gaul_wall_short.xml index 2037aa1d06..36acc0ae27 100644 --- a/binaries/data/mods/public/simulation/templates/structures/gaul_wall_short.xml +++ b/binaries/data/mods/public/simulation/templates/structures/gaul_wall_short.xml @@ -4,9 +4,6 @@ 9.0 - - 3000 - gaul structures/gaul_wallset_stone diff --git a/binaries/data/mods/public/simulation/templates/structures/iber_wall_medium.xml b/binaries/data/mods/public/simulation/templates/structures/iber_wall_medium.xml index 8f3cde80d0..842f76c6f7 100644 --- a/binaries/data/mods/public/simulation/templates/structures/iber_wall_medium.xml +++ b/binaries/data/mods/public/simulation/templates/structures/iber_wall_medium.xml @@ -17,9 +17,6 @@ - - 3000 - iber structures/iber_wallset_stone diff --git a/binaries/data/mods/public/simulation/templates/structures/iber_wall_short.xml b/binaries/data/mods/public/simulation/templates/structures/iber_wall_short.xml index d2d9ff233e..c785a2faca 100644 --- a/binaries/data/mods/public/simulation/templates/structures/iber_wall_short.xml +++ b/binaries/data/mods/public/simulation/templates/structures/iber_wall_short.xml @@ -4,9 +4,6 @@ 9.0 - - 3000 - iber structures/iber_wallset_stone diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_wall_gate.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_wall_gate.xml index 418331e344..f201573bfa 100644 --- a/binaries/data/mods/public/simulation/templates/structures/ptol_wall_gate.xml +++ b/binaries/data/mods/public/simulation/templates/structures/ptol_wall_gate.xml @@ -7,7 +7,6 @@ ptol sba-n-njwt - (Insert history) diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_wall_long.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_wall_long.xml index 9b6c4876f4..10c5c5e74c 100644 --- a/binaries/data/mods/public/simulation/templates/structures/ptol_wall_long.xml +++ b/binaries/data/mods/public/simulation/templates/structures/ptol_wall_long.xml @@ -25,6 +25,7 @@ ptol + Ptolemaic cities were surrounded by limestone walls for protection against enemy attacks. Some of these fortifications were massive structures. structures/ptol_wallset_stone h-n-njwt diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_wall_medium.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_wall_medium.xml index 54a9fe2042..a702bce5af 100644 --- a/binaries/data/mods/public/simulation/templates/structures/ptol_wall_medium.xml +++ b/binaries/data/mods/public/simulation/templates/structures/ptol_wall_medium.xml @@ -19,6 +19,7 @@ ptol + Ptolemaic cities were surrounded by limestone walls for protection against enemy attacks. Some of these fortifications were massive structures. structures/mace_wallset_stone h-n-njwt diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_wall_short.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_wall_short.xml index 80cbd32b8e..aca313c413 100644 --- a/binaries/data/mods/public/simulation/templates/structures/ptol_wall_short.xml +++ b/binaries/data/mods/public/simulation/templates/structures/ptol_wall_short.xml @@ -6,6 +6,7 @@ ptol + Ptolemaic cities were surrounded by limestone walls for protection against enemy attacks. Some of these fortifications were massive structures. structures/mace_wallset_stone h-n-njwt diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_gate.xml b/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_gate.xml index 043c79fcca..467b2790f5 100644 --- a/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_gate.xml +++ b/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_gate.xml @@ -13,18 +13,12 @@ own neutral enemy - - - 80 - 0 - - 7.0 - 2000 + 0.75 rome diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml b/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml index fcb3ab1bbe..c4a452ac56 100644 --- a/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml +++ b/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml @@ -43,7 +43,7 @@ - 2000 + 0.75 rome diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_medium.xml b/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_medium.xml index dcb9c96676..df6876eb72 100644 --- a/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_medium.xml +++ b/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_medium.xml @@ -24,7 +24,7 @@ 7.0 - 1500 + 0.75 diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_short.xml b/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_short.xml index 2ec4273180..0b82f82e70 100644 --- a/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_short.xml +++ b/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_short.xml @@ -24,7 +24,7 @@ 7.0 - 1000 + 0.75 rome diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_tower.xml b/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_tower.xml index dbc61e88ae..e2190abfcc 100644 --- a/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_tower.xml @@ -24,7 +24,7 @@ 14.0 - 2000 + 0.75 rome diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_wall_medium.xml b/binaries/data/mods/public/simulation/templates/structures/rome_wall_medium.xml index cad4e943f4..791048144c 100644 --- a/binaries/data/mods/public/simulation/templates/structures/rome_wall_medium.xml +++ b/binaries/data/mods/public/simulation/templates/structures/rome_wall_medium.xml @@ -17,9 +17,6 @@ - - 3000 - rome structures/rome_wallset_stone diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_wall_short.xml b/binaries/data/mods/public/simulation/templates/structures/rome_wall_short.xml index d73f36876a..8a651c5137 100644 --- a/binaries/data/mods/public/simulation/templates/structures/rome_wall_short.xml +++ b/binaries/data/mods/public/simulation/templates/structures/rome_wall_short.xml @@ -4,9 +4,6 @@ 9.0 - - 3000 - rome structures/rome_wallset_stone diff --git a/binaries/data/mods/public/simulation/templates/structures/spart_wall_medium.xml b/binaries/data/mods/public/simulation/templates/structures/spart_wall_medium.xml index 13d26d996d..e7c0c0d293 100644 --- a/binaries/data/mods/public/simulation/templates/structures/spart_wall_medium.xml +++ b/binaries/data/mods/public/simulation/templates/structures/spart_wall_medium.xml @@ -4,9 +4,6 @@ 9.0 - - 3000 - spart structures/spart_wallset_stone diff --git a/binaries/data/mods/public/simulation/templates/structures/spart_wall_short.xml b/binaries/data/mods/public/simulation/templates/structures/spart_wall_short.xml index 98d9892d9a..af8f76537a 100644 --- a/binaries/data/mods/public/simulation/templates/structures/spart_wall_short.xml +++ b/binaries/data/mods/public/simulation/templates/structures/spart_wall_short.xml @@ -4,9 +4,6 @@ 9.0 - - 3000 - spart structures/spart_wallset_stone diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml index b8550bfb91..53f0d01bac 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml @@ -1,33 +1,14 @@ - - - Wall - - - - 4.5 - - - 0 - - 50 - - - - - 8.0 - + + + 20 - - 3000 - rubble/rubble_stone_wall_long - City Gate Allow units access through a city wall. Can be locked to prevent access. - -ConquestCritical StoneWall Gates + Gates structures/gate.png phase_town @@ -39,14 +20,13 @@ 0 + - - @@ -58,12 +38,5 @@ interface/select/building/sel_gate.xml - - false - 20 - 65535 - - - structures/fndn_wall.xml - +