From 827352aa4e0af542eb26714c2c1b1cf2699eaae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Mon, 8 Jul 2013 21:22:17 +0200 Subject: [PATCH] consistently name tank traps --- mods/ra/bits/{tanktrap.shp => tanktrap1.shp} | Bin mods/ra/bits/{czh1.shp => tanktrap2.shp} | Bin mods/ra/rules/trees.yaml | 18 +++++++++--------- mods/ra/sequences/map.yaml | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) rename mods/ra/bits/{tanktrap.shp => tanktrap1.shp} (100%) rename mods/ra/bits/{czh1.shp => tanktrap2.shp} (100%) diff --git a/mods/ra/bits/tanktrap.shp b/mods/ra/bits/tanktrap1.shp similarity index 100% rename from mods/ra/bits/tanktrap.shp rename to mods/ra/bits/tanktrap1.shp diff --git a/mods/ra/bits/czh1.shp b/mods/ra/bits/tanktrap2.shp similarity index 100% rename from mods/ra/bits/czh1.shp rename to mods/ra/bits/tanktrap2.shp diff --git a/mods/ra/rules/trees.yaml b/mods/ra/rules/trees.yaml index 4351dda965..6915242267 100644 --- a/mods/ra/rules/trees.yaml +++ b/mods/ra/rules/trees.yaml @@ -332,14 +332,6 @@ T04: Footprint: __ x_ Dimensions: 2,2 -CZH1: - Inherits: ^Rock - Building: - Footprint: x - Dimensions: 1,1 - Tooltip: - Name: Czech Hedgehog - STSGA: Inherits: ^Tree Tooltip: @@ -350,7 +342,15 @@ STSGB: Tooltip: Name: Utility Pole -TANKTRAP: +TANKTRAP1: + Inherits: ^Rock + Building: + Footprint: x + Dimensions: 1,1 + Tooltip: + Name: Tank Trap + +TANKTRAP2: Inherits: ^Rock Building: Footprint: x diff --git a/mods/ra/sequences/map.yaml b/mods/ra/sequences/map.yaml index 4668eeb75a..d9309c8241 100644 --- a/mods/ra/sequences/map.yaml +++ b/mods/ra/sequences/map.yaml @@ -619,10 +619,6 @@ v37: damaged-idle: Start: 1 -czh1: - idle: - Start: 0 - stsga: idle: Start: 0 @@ -644,7 +640,11 @@ ammobox: # TODO: there are 2 more variants, but the editor does not like the spl Start: 0 Length: 1 -tanktrap: +tanktrap1: + idle: + Start: 0 + +tanktrap2: idle: Start: 0