From a6d38c9260195d926dc1bce5dea97d4c08cf5bf5 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Thu, 18 Jun 2015 21:23:36 +0100 Subject: [PATCH] Fix temperate tileset naming. --- mods/ts/maps/arivruns/map.yaml | 2 +- mods/ts/maps/blank-conquest/map.yaml | 2 +- mods/ts/maps/blank-shellmap/map.yaml | 2 +- mods/ts/mod.yaml | 6 +- mods/ts/rules/civilian-structures.yaml | 82 +++++++++---------- mods/ts/rules/defaults.yaml | 2 +- mods/ts/rules/palettes.yaml | 2 +- mods/ts/sequences/misc.yaml | 2 +- .../{temperat.yaml => temperate.yaml} | 2 +- 9 files changed, 51 insertions(+), 51 deletions(-) rename mods/ts/tilesets/{temperat.yaml => temperate.yaml} (99%) diff --git a/mods/ts/maps/arivruns/map.yaml b/mods/ts/maps/arivruns/map.yaml index 4d10c931a2..bcb24d0b25 100644 --- a/mods/ts/maps/arivruns/map.yaml +++ b/mods/ts/maps/arivruns/map.yaml @@ -8,7 +8,7 @@ Description: Describe your map here Author: Westwood Studios -Tileset: TEMPERAT +Tileset: TEMPERATE MapSize: 134,256 diff --git a/mods/ts/maps/blank-conquest/map.yaml b/mods/ts/maps/blank-conquest/map.yaml index ba68fa43b2..b657d5fafc 100644 --- a/mods/ts/maps/blank-conquest/map.yaml +++ b/mods/ts/maps/blank-conquest/map.yaml @@ -8,7 +8,7 @@ Description: Placeholder Author: Matthias Mailänder -Tileset: TEMPERAT +Tileset: TEMPERATE MapSize: 128,128 diff --git a/mods/ts/maps/blank-shellmap/map.yaml b/mods/ts/maps/blank-shellmap/map.yaml index 834a6a897a..50511b72dc 100644 --- a/mods/ts/maps/blank-shellmap/map.yaml +++ b/mods/ts/maps/blank-shellmap/map.yaml @@ -8,7 +8,7 @@ Description: Placeholder Author: Matthias Mailänder -Tileset: TEMPERAT +Tileset: TEMPERATE MapSize: 128,128 diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml index 91231d6ae3..faadec27ee 100644 --- a/mods/ts/mod.yaml +++ b/mods/ts/mod.yaml @@ -109,7 +109,7 @@ VoxelSequences: ./mods/ts/sequences/voxels.yaml TileSets: - ./mods/ts/tilesets/temperat.yaml + ./mods/ts/tilesets/temperate.yaml ./mods/ts/tilesets/snow.yaml TileSize: 48,24 @@ -252,8 +252,8 @@ SpriteFormats: ShpTS, TmpTS, ShpTD SpriteSequenceFormat: TilesetSpecificSpriteSequence TilesetExtensions: - TEMPERAT: .tem + TEMPERATE: .tem SNOW: .sno TilesetCodes: - TEMPERAT: t + TEMPERATE: t SNOW: a diff --git a/mods/ts/rules/civilian-structures.yaml b/mods/ts/rules/civilian-structures.yaml index a844475741..87a380d16f 100644 --- a/mods/ts/rules/civilian-structures.yaml +++ b/mods/ts/rules/civilian-structures.yaml @@ -10,7 +10,7 @@ ABAN01: Health: HP: 600 EditorTilesetFilter: - ExcludeTilesets: TEMPERAT + ExcludeTilesets: TEMPERATE ABAN02: Inherits: ^CivBuilding @@ -24,7 +24,7 @@ ABAN02: Health: HP: 600 EditorTilesetFilter: - ExcludeTilesets: TEMPERAT + ExcludeTilesets: TEMPERATE ABAN03: Inherits: ^CivBuilding @@ -38,7 +38,7 @@ ABAN03: Health: HP: 500 EditorTilesetFilter: - ExcludeTilesets: TEMPERAT + ExcludeTilesets: TEMPERATE ABAN04: Inherits: ^CivBuilding @@ -52,7 +52,7 @@ ABAN04: Health: HP: 400 EditorTilesetFilter: - ExcludeTilesets: TEMPERAT + ExcludeTilesets: TEMPERATE ABAN05: Inherits: ^CivBuilding @@ -66,7 +66,7 @@ ABAN05: Health: HP: 500 EditorTilesetFilter: - ExcludeTilesets: TEMPERAT + ExcludeTilesets: TEMPERATE ABAN06: Inherits: ^CivBuilding @@ -80,7 +80,7 @@ ABAN06: Health: HP: 500 EditorTilesetFilter: - ExcludeTilesets: TEMPERAT + ExcludeTilesets: TEMPERATE ABAN07: Inherits: ^CivBuilding @@ -94,7 +94,7 @@ ABAN07: Health: HP: 350 EditorTilesetFilter: - ExcludeTilesets: TEMPERAT + ExcludeTilesets: TEMPERATE ABAN08: Inherits: ^CivBuilding @@ -108,7 +108,7 @@ ABAN08: Health: HP: 500 EditorTilesetFilter: - ExcludeTilesets: TEMPERAT + ExcludeTilesets: TEMPERATE ABAN09: Inherits: ^CivBuilding @@ -122,7 +122,7 @@ ABAN09: Health: HP: 350 EditorTilesetFilter: - ExcludeTilesets: TEMPERAT + ExcludeTilesets: TEMPERATE ABAN10: Inherits: ^CivBuilding @@ -136,7 +136,7 @@ ABAN10: Health: HP: 500 EditorTilesetFilter: - ExcludeTilesets: TEMPERAT + ExcludeTilesets: TEMPERATE ABAN11: Inherits: ^CivBuilding @@ -150,7 +150,7 @@ ABAN11: Health: HP: 400 EditorTilesetFilter: - ExcludeTilesets: TEMPERAT + ExcludeTilesets: TEMPERATE ABAN12: Inherits: ^CivBuilding @@ -164,7 +164,7 @@ ABAN12: Health: HP: 400 EditorTilesetFilter: - ExcludeTilesets: TEMPERAT + ExcludeTilesets: TEMPERATE ABAN13: Inherits: ^CivBuilding @@ -178,7 +178,7 @@ ABAN13: Health: HP: 400 EditorTilesetFilter: - ExcludeTilesets: TEMPERAT + ExcludeTilesets: TEMPERATE ABAN14: Inherits: ^CivBuilding @@ -192,7 +192,7 @@ ABAN14: Health: HP: 300 EditorTilesetFilter: - ExcludeTilesets: TEMPERAT + ExcludeTilesets: TEMPERATE ABAN15: Inherits: ^CivBuilding @@ -206,7 +206,7 @@ ABAN15: Health: HP: 400 EditorTilesetFilter: - ExcludeTilesets: TEMPERAT + ExcludeTilesets: TEMPERATE ABAN16: Inherits: ^CivBuilding @@ -220,7 +220,7 @@ ABAN16: Health: HP: 400 EditorTilesetFilter: - ExcludeTilesets: TEMPERAT + ExcludeTilesets: TEMPERATE ABAN17: Inherits: ^CivBuilding @@ -234,7 +234,7 @@ ABAN17: Health: HP: 400 EditorTilesetFilter: - ExcludeTilesets: TEMPERAT + ExcludeTilesets: TEMPERATE ABAN18: Inherits: ^CivBuilding @@ -248,7 +248,7 @@ ABAN18: Health: HP: 400 EditorTilesetFilter: - ExcludeTilesets: TEMPERAT + ExcludeTilesets: TEMPERATE AMMOCRAT: Inherits: ^CivBuilding @@ -835,7 +835,7 @@ CITY01: Health: HP: 400 EditorTilesetFilter: - RequireTilesets: TEMPERAT + RequireTilesets: TEMPERATE CITY02: Inherits: ^CivBuilding @@ -849,7 +849,7 @@ CITY02: Health: HP: 700 EditorTilesetFilter: - RequireTilesets: TEMPERAT + RequireTilesets: TEMPERATE CITY03: Inherits: ^CivBuilding @@ -863,7 +863,7 @@ CITY03: Health: HP: 500 EditorTilesetFilter: - RequireTilesets: TEMPERAT + RequireTilesets: TEMPERATE CITY04: Inherits: ^CivBuilding @@ -877,7 +877,7 @@ CITY04: Health: HP: 600 EditorTilesetFilter: - RequireTilesets: TEMPERAT + RequireTilesets: TEMPERATE CITY05: Inherits: ^CivBuilding @@ -891,7 +891,7 @@ CITY05: Health: HP: 600 EditorTilesetFilter: - RequireTilesets: TEMPERAT + RequireTilesets: TEMPERATE CITY06: Inherits: ^CivBuilding @@ -905,7 +905,7 @@ CITY06: Health: HP: 500 EditorTilesetFilter: - RequireTilesets: TEMPERAT + RequireTilesets: TEMPERATE CITY07: Inherits: ^CivBuilding @@ -919,7 +919,7 @@ CITY07: Health: HP: 400 EditorTilesetFilter: - RequireTilesets: TEMPERAT + RequireTilesets: TEMPERATE CITY08: Inherits: ^CivBuilding @@ -933,7 +933,7 @@ CITY08: Health: HP: 300 EditorTilesetFilter: - RequireTilesets: TEMPERAT + RequireTilesets: TEMPERATE CITY09: Inherits: ^CivBuilding @@ -947,7 +947,7 @@ CITY09: Health: HP: 400 EditorTilesetFilter: - RequireTilesets: TEMPERAT + RequireTilesets: TEMPERATE CITY10: Inherits: ^CivBuilding @@ -961,7 +961,7 @@ CITY10: Health: HP: 300 EditorTilesetFilter: - RequireTilesets: TEMPERAT + RequireTilesets: TEMPERATE CITY11: Inherits: ^CivBuilding @@ -975,7 +975,7 @@ CITY11: Health: HP: 500 EditorTilesetFilter: - RequireTilesets: TEMPERAT + RequireTilesets: TEMPERATE CITY12: Inherits: ^CivBuilding @@ -989,7 +989,7 @@ CITY12: Health: HP: 600 EditorTilesetFilter: - RequireTilesets: TEMPERAT + RequireTilesets: TEMPERATE CITY13: Inherits: ^CivBuilding @@ -1003,7 +1003,7 @@ CITY13: Health: HP: 500 EditorTilesetFilter: - RequireTilesets: TEMPERAT + RequireTilesets: TEMPERATE CITY14: Inherits: ^CivBuilding @@ -1017,7 +1017,7 @@ CITY14: Health: HP: 600 EditorTilesetFilter: - RequireTilesets: TEMPERAT + RequireTilesets: TEMPERATE CITY15: Inherits: ^CivBuilding @@ -1031,7 +1031,7 @@ CITY15: Health: HP: 500 EditorTilesetFilter: - RequireTilesets: TEMPERAT + RequireTilesets: TEMPERATE CITY16: Inherits: ^CivBuilding @@ -1045,7 +1045,7 @@ CITY16: Health: HP: 500 EditorTilesetFilter: - RequireTilesets: TEMPERAT + RequireTilesets: TEMPERATE CITY17: Inherits: ^CivBuilding @@ -1059,7 +1059,7 @@ CITY17: Health: HP: 300 EditorTilesetFilter: - RequireTilesets: TEMPERAT + RequireTilesets: TEMPERATE CITY18: Inherits: ^CivBuilding @@ -1073,7 +1073,7 @@ CITY18: Health: HP: 600 EditorTilesetFilter: - RequireTilesets: TEMPERAT + RequireTilesets: TEMPERATE CITY19: Inherits: ^CivBuilding @@ -1087,7 +1087,7 @@ CITY19: Health: HP: 500 EditorTilesetFilter: - RequireTilesets: TEMPERAT + RequireTilesets: TEMPERATE CITY20: Inherits: ^CivBuilding @@ -1101,7 +1101,7 @@ CITY20: Health: HP: 250 EditorTilesetFilter: - RequireTilesets: TEMPERAT + RequireTilesets: TEMPERATE CITY21: Inherits: ^CivBuilding @@ -1115,7 +1115,7 @@ CITY21: Health: HP: 100 EditorTilesetFilter: - RequireTilesets: TEMPERAT + RequireTilesets: TEMPERATE CITY22: Inherits: ^CivBuilding @@ -1129,7 +1129,7 @@ CITY22: Health: HP: 100 EditorTilesetFilter: - RequireTilesets: TEMPERAT + RequireTilesets: TEMPERATE CTDAM: Inherits: ^CivBuilding @@ -1413,7 +1413,7 @@ UFO: Armor: Type: Heavy EditorTilesetFilter: - RequireTilesets: TEMPERAT + RequireTilesets: TEMPERATE SelectionDecorations: VisualBounds: 144, 72, 0, 0 diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 933d2d16d2..d92bf97825 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -122,7 +122,7 @@ Health: HP: 400 EditorTilesetFilter: - RequireTilesets: TEMPERAT + RequireTilesets: TEMPERATE ^Crate: HiddenUnderShroud: diff --git a/mods/ts/rules/palettes.yaml b/mods/ts/rules/palettes.yaml index 6190eaee09..b9ea147669 100644 --- a/mods/ts/rules/palettes.yaml +++ b/mods/ts/rules/palettes.yaml @@ -9,7 +9,7 @@ ShadowIndex: 1 PaletteFromFile@playertem: Name: player - Tileset: TEMPERAT + Tileset: TEMPERATE Filename: unittem.pal ShadowIndex: 1 PaletteFromFile@depth: diff --git a/mods/ts/sequences/misc.yaml b/mods/ts/sequences/misc.yaml index b5e1561397..88bda292ca 100644 --- a/mods/ts/sequences/misc.yaml +++ b/mods/ts/sequences/misc.yaml @@ -2,7 +2,7 @@ overlay: Defaults: place Offset: 0, -12 build-valid-snow: - build-valid-temperat: + build-valid-temperate: build-invalid: Start: 1 target-select: diff --git a/mods/ts/tilesets/temperat.yaml b/mods/ts/tilesets/temperate.yaml similarity index 99% rename from mods/ts/tilesets/temperat.yaml rename to mods/ts/tilesets/temperate.yaml index 17ca38b1d5..72083bb1a2 100644 --- a/mods/ts/tilesets/temperat.yaml +++ b/mods/ts/tilesets/temperate.yaml @@ -1,6 +1,6 @@ General: Name: Temperate - Id: TEMPERAT + Id: TEMPERATE Palette: isotem.pal MaxGroundHeight: 16 HeightDebugColors: 128,0,0,0, 128,0,0,68, 128,0,0,136, 128,0,0,204, 128,0,0,255, 128,68,0,204, 128,136,0,136, 128,204,0,68, 128,255,17,0, 128,255,85,0, 128,255,153,0, 128,255,221,0, 128,221,255,0, 128,153,255,0, 128,85,255,0, 128,17,255,0