From 0b495204627992ae2ca57d61636f1934678f56df Mon Sep 17 00:00:00 2001 From: ZhilkinSerg Date: Sat, 23 Nov 2019 16:42:52 +0300 Subject: [PATCH 1/3] Remove duplicate overmap terrain definition --- .../overmap_terrain_commercial.json | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json b/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json index bc95887c2e749..623cd199d689a 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json @@ -3028,23 +3028,6 @@ "color": "white", "flags": [ "SOURCE_VEHICLES" ] }, - { - "type": "overmap_terrain", - "id": "cs_tire_shop_roof", - "copy-from": "generic_city_building", - "name": "tire shop roof", - "sym": "O", - "color": "white" - }, - { - "type": "overmap_terrain", - "id": "headshop", - "copy-from": "generic_city_building", - "name": "Head Shop", - "sym": "0", - "color": "i_white", - "flags": [ "SOURCE_LUXURY" ] - }, { "type": "overmap_terrain", "id": "headshop", From dac8c1ff03eaf7cb52f51697ed279df78b324dc5 Mon Sep 17 00:00:00 2001 From: ZhilkinSerg Date: Sat, 23 Nov 2019 16:51:00 +0300 Subject: [PATCH 2/3] Update overmap_terrain_commercial.json --- .../overmap_terrain/overmap_terrain_commercial.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json b/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json index 623cd199d689a..674de9f99a8dd 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json @@ -3028,6 +3028,14 @@ "color": "white", "flags": [ "SOURCE_VEHICLES" ] }, + { + "type": "overmap_terrain", + "id": "cs_tire_shop_roof", + "copy-from": "generic_city_building", + "name": "tire shop roof", + "sym": "O", + "color": "white" + }, { "type": "overmap_terrain", "id": "headshop", From 6f60d751e8124dc59f6c678af608a8ba388c917e Mon Sep 17 00:00:00 2001 From: ZhilkinSerg Date: Sat, 23 Nov 2019 16:56:21 +0300 Subject: [PATCH 3/3] Update overmap_terrain_commercial.json --- .../overmap_terrain/overmap_terrain_commercial.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json b/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json index 674de9f99a8dd..8b141a4428201 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json @@ -3030,11 +3030,11 @@ }, { "type": "overmap_terrain", - "id": "cs_tire_shop_roof", - "copy-from": "generic_city_building", - "name": "tire shop roof", - "sym": "O", - "color": "white" + "id": "cs_tire_shop_roof", + "copy-from": "generic_city_building", + "name": "tire shop roof", + "sym": "O", + "color": "white" }, { "type": "overmap_terrain",