From ef53d85ee47d2a1afebd1ea548b420d94453f3e9 Mon Sep 17 00:00:00 2001
From: Stan <stan@wildfiregames.com>
Date: Tue, 3 Sep 2019 09:45:41 +0000
Subject: [PATCH] Rename the unusable 'roads/medit_city_tile.xml' to
 'roads/medit_city_tile_02.xml' so that it can be used again. It was broken
 since its addition in 88ab3f0f5b. Make use of the normal and spec maps and
 rename them with the same convention.

Fixes #5558

This was SVN commit r22837.
---
 .../mods/public/art/terrains/road/medit_city_tile.xml    | 7 -------
 .../mods/public/art/terrains/road/medit_city_tile_02.xml | 9 +++++++++
 .../{medit_city_tile_2.dds => medit_city_tile_02.dds}    | 0
 ..._city_tile_2_norm.png => medit_city_tile_02_norm.png} | 0
 ..._city_tile_2_spec.png => medit_city_tile_02_spec.png} | 0
 5 files changed, 9 insertions(+), 7 deletions(-)
 delete mode 100644 binaries/data/mods/public/art/terrains/road/medit_city_tile.xml
 create mode 100644 binaries/data/mods/public/art/terrains/road/medit_city_tile_02.xml
 rename binaries/data/mods/public/art/textures/terrain/types/{medit_city_tile_2.dds => medit_city_tile_02.dds} (100%)
 rename binaries/data/mods/public/art/textures/terrain/types/{medit_city_tile_2_norm.png => medit_city_tile_02_norm.png} (100%)
 rename binaries/data/mods/public/art/textures/terrain/types/{medit_city_tile_2_spec.png => medit_city_tile_02_spec.png} (100%)

diff --git a/binaries/data/mods/public/art/terrains/road/medit_city_tile.xml b/binaries/data/mods/public/art/terrains/road/medit_city_tile.xml
deleted file mode 100644
index 56f57c3945..0000000000
--- a/binaries/data/mods/public/art/terrains/road/medit_city_tile.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<terrain>
-        <textures>
-                <texture name="baseTex" file="types/medit_city_tile_2.dds"/>
-        </textures>
-        <material>terrain_base.xml</material>
-</terrain>
diff --git a/binaries/data/mods/public/art/terrains/road/medit_city_tile_02.xml b/binaries/data/mods/public/art/terrains/road/medit_city_tile_02.xml
new file mode 100644
index 0000000000..6b82904b21
--- /dev/null
+++ b/binaries/data/mods/public/art/terrains/road/medit_city_tile_02.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<terrain>
+  <textures>
+    <texture name="baseTex" file="types/medit_city_tile_02.dds"/>
+    <texture name="normTex" file="types/medit_city_tile_02_norm.png"/>
+    <texture name="specTex" file="types/medit_city_tile_02_spec.png"/>
+  </textures>
+	<material>terrain_norm_spec.xml</material>
+</terrain>
diff --git a/binaries/data/mods/public/art/textures/terrain/types/medit_city_tile_2.dds b/binaries/data/mods/public/art/textures/terrain/types/medit_city_tile_02.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/terrain/types/medit_city_tile_2.dds
rename to binaries/data/mods/public/art/textures/terrain/types/medit_city_tile_02.dds
diff --git a/binaries/data/mods/public/art/textures/terrain/types/medit_city_tile_2_norm.png b/binaries/data/mods/public/art/textures/terrain/types/medit_city_tile_02_norm.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/terrain/types/medit_city_tile_2_norm.png
rename to binaries/data/mods/public/art/textures/terrain/types/medit_city_tile_02_norm.png
diff --git a/binaries/data/mods/public/art/textures/terrain/types/medit_city_tile_2_spec.png b/binaries/data/mods/public/art/textures/terrain/types/medit_city_tile_02_spec.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/terrain/types/medit_city_tile_2_spec.png
rename to binaries/data/mods/public/art/textures/terrain/types/medit_city_tile_02_spec.png