From 6264784c1aa082c8477c3673c07be415fe54a392 Mon Sep 17 00:00:00 2001 From: Psydev Date: Sun, 11 May 2014 22:30:13 -0700 Subject: [PATCH 1/8] fix template 84 (rock) --- mods/cnc/tilesets/snow.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/mods/cnc/tilesets/snow.yaml b/mods/cnc/tilesets/snow.yaml index 5491867db1..4e8a9f37fb 100644 --- a/mods/cnc/tilesets/snow.yaml +++ b/mods/cnc/tilesets/snow.yaml @@ -677,6 +677,7 @@ Templates: Tiles: 0: Rock 1: Rock + 2: Rock Template@88: Id: 88 Image: sh6 From ba85d33e09c817f884413a8e0a20561ccf12b4da Mon Sep 17 00:00:00 2001 From: Psydev Date: Sun, 11 May 2014 22:38:55 -0700 Subject: [PATCH 2/8] fix passability of Template 49 (snow) --- mods/cnc/tilesets/snow.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/mods/cnc/tilesets/snow.yaml b/mods/cnc/tilesets/snow.yaml index 4e8a9f37fb..a4a9257174 100644 --- a/mods/cnc/tilesets/snow.yaml +++ b/mods/cnc/tilesets/snow.yaml @@ -553,6 +553,7 @@ Templates: Size: 2,2 Tiles: 0: Rock + 1: Rock 2: Rock 3: Rock Template@50: From da048fffe4813392fca95e3520519cf848ab7c0d Mon Sep 17 00:00:00 2001 From: Psydev Date: Sun, 11 May 2014 22:45:03 -0700 Subject: [PATCH 3/8] fix template 35 (snow) passability --- mods/cnc/tilesets/snow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/cnc/tilesets/snow.yaml b/mods/cnc/tilesets/snow.yaml index a4a9257174..34b53a17b1 100644 --- a/mods/cnc/tilesets/snow.yaml +++ b/mods/cnc/tilesets/snow.yaml @@ -431,8 +431,8 @@ Templates: Image: s23 Size: 3,2 Tiles: - 0: Rock 1: Rock + 2: Rock 3: Rock 4: Rock Template@36: From e9fabbe955c3902057d02a903db0f0cfca8b8505 Mon Sep 17 00:00:00 2001 From: Psydev Date: Sun, 11 May 2014 23:01:20 -0700 Subject: [PATCH 4/8] fix template 14 (snow) --- mods/cnc/tilesets/snow.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/mods/cnc/tilesets/snow.yaml b/mods/cnc/tilesets/snow.yaml index 34b53a17b1..30f080d1af 100644 --- a/mods/cnc/tilesets/snow.yaml +++ b/mods/cnc/tilesets/snow.yaml @@ -262,6 +262,7 @@ Templates: 0: Rock 2: Rock 3: Rock + 4: Rock 5: Rock Template@15: Id: 15 From 42b56de4b83c9671f82d0310c22403d6ee09a92c Mon Sep 17 00:00:00 2001 From: Psydev Date: Sun, 11 May 2014 23:07:54 -0700 Subject: [PATCH 5/8] did same changes as snow tile, except 1 rock (the rock is different in the snow tile, which is why it looked funny) --- mods/cnc/tilesets/temperat.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mods/cnc/tilesets/temperat.yaml b/mods/cnc/tilesets/temperat.yaml index 3ece050dbb..adb18cb701 100644 --- a/mods/cnc/tilesets/temperat.yaml +++ b/mods/cnc/tilesets/temperat.yaml @@ -262,6 +262,7 @@ Templates: 0: Rock 2: Rock 3: Rock + 4: Rock 5: Rock Template@15: Id: 15 @@ -431,8 +432,8 @@ Templates: Image: s23 Size: 3,2 Tiles: - 0: Rock 1: Rock + 2: Rock 3: Rock 4: Rock Template@36: @@ -553,6 +554,7 @@ Templates: Size: 2,2 Tiles: 0: Rock + 1: Rock 2: Rock 3: Rock Template@50: From 687e3bff873c265e61a3f14dc9dc360c460b3d9c Mon Sep 17 00:00:00 2001 From: Psydev Date: Sun, 11 May 2014 23:15:37 -0700 Subject: [PATCH 6/8] applied same changes to winter.yaml --- mods/cnc/tilesets/winter.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mods/cnc/tilesets/winter.yaml b/mods/cnc/tilesets/winter.yaml index 9ccbedc55d..b7941b4363 100644 --- a/mods/cnc/tilesets/winter.yaml +++ b/mods/cnc/tilesets/winter.yaml @@ -262,6 +262,7 @@ Templates: 0: Rock 2: Rock 3: Rock + 4: Rock 5: Rock Template@15: Id: 15 @@ -431,8 +432,8 @@ Templates: Image: s23 Size: 3,2 Tiles: - 0: Rock 1: Rock + 2: Rock 3: Rock 4: Rock Template@36: @@ -553,6 +554,7 @@ Templates: Size: 2,2 Tiles: 0: Rock + 1: Rock 2: Rock 3: Rock Template@50: From 186e49aaeeab8e469cd1b6aadcdbf837c2e868a7 Mon Sep 17 00:00:00 2001 From: Psydev Date: Sun, 11 May 2014 23:34:03 -0700 Subject: [PATCH 7/8] did same changes to desert tileset --- mods/cnc/tilesets/desert.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mods/cnc/tilesets/desert.yaml b/mods/cnc/tilesets/desert.yaml index a53857d2cf..c7d700f405 100644 --- a/mods/cnc/tilesets/desert.yaml +++ b/mods/cnc/tilesets/desert.yaml @@ -152,6 +152,7 @@ Templates: 0: Rock 2: Rock 3: Rock + 4: Rock 5: Rock Template@15: Id: 15 @@ -321,8 +322,8 @@ Templates: Image: s23 Size: 3,2 Tiles: - 0: Rock 1: Rock + 2: Rock 3: Rock 4: Rock Template@36: @@ -443,6 +444,7 @@ Templates: Size: 2,2 Tiles: 0: Rock + 1: Rock 2: Rock 3: Rock Template@50: From 0d9b84af51b553372b8c1a092a8061faa41eaa6a Mon Sep 17 00:00:00 2001 From: psydev Date: Mon, 12 May 2014 02:05:48 -0700 Subject: [PATCH 8/8] Fixed the rocks in desert tileset They were all set to inherit defaults, few of them were set properly. You could drive through most of them. --- mods/cnc/rules/trees.yaml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/mods/cnc/rules/trees.yaml b/mods/cnc/rules/trees.yaml index 58185bd533..fd712d16b6 100644 --- a/mods/cnc/rules/trees.yaml +++ b/mods/cnc/rules/trees.yaml @@ -22,24 +22,41 @@ SPLITBLUE: ROCK1: Inherits: ^Rock - + Building: + Footprint: __ xx + ROCK2: Inherits: ^Rock + Building: + Footprint: xx_ + Dimensions: 3,1 ROCK3: Inherits: ^Rock ROCK4: Inherits: ^Rock + Building: + Footprint: x + Dimensions: 1,1 ROCK5: Inherits: ^Rock + Building: + Footprint: x_ + Dimensions: 2,1 ROCK6: Inherits: ^Rock + Building: + Footprint: ___ xxx + Dimensions: 3,2 ROCK7: Inherits: ^Rock + Building: + Footprint: xxxx + Dimensions: 4,1 T01: Inherits: ^Tree