From f13343ef2ea4700c652c3b74567f91adbe99b4e7 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Tue, 12 Oct 2010 12:23:14 +1300 Subject: [PATCH] Fix tilesets colours for snow and blue tib, fix unit speed over tib, fix lst pathability. --- mods/cnc/rules/defaults.yaml | 10 +++++++--- mods/cnc/rules/system.yaml | 4 +++- mods/cnc/rules/trees.yaml | 4 ++-- mods/cnc/rules/vehicles.yaml | 6 ++---- mods/cnc/tilesets/desert.yaml | 9 +++++++-- mods/cnc/tilesets/snow.yaml | 11 ++++++++--- mods/cnc/tilesets/temperat.yaml | 9 +++++++-- mods/cnc/tilesets/winter.yaml | 9 +++++++-- 8 files changed, 43 insertions(+), 19 deletions(-) diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 8ca620eded..74fbf13172 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -6,7 +6,8 @@ Clear: 60 Rough: 40 Road: 100 - Ore: 70 + Tiberium: 40 + BlueTiberium: 40 Beach: 40 ROT: 5 Selectable: @@ -36,7 +37,8 @@ Clear: 80 Rough: 70 Road: 100 - Ore: 90 + Tiberium: 70 + BlueTiberium: 70 Beach: 70 ROT: 5 Selectable: @@ -91,7 +93,9 @@ Clear: 90 Rough: 80 Road: 100 - Ore: 90 + Tiberium: 70 + PathingCost: 200 + BlueTiberium: 70 PathingCost: 200 Beach: 80 Selectable: diff --git a/mods/cnc/rules/system.yaml b/mods/cnc/rules/system.yaml index 9d9c9582c3..d234e56710 100644 --- a/mods/cnc/rules/system.yaml +++ b/mods/cnc/rules/system.yaml @@ -101,12 +101,14 @@ World: ResourceType@green-tib: ResourceType: 1 Palette: terrain + TerrainType: Tiberium SpriteNames: ti1,ti2,ti3,ti4,ti5,ti6,ti7,ti8,ti9,ti10,ti11,ti12 ValuePerUnit: 30 Name: Tiberium ResourceType@blue-tib: ResourceType: 2 Palette: terrain + TerrainType: BlueTiberium SpriteNames: bti1,bti2,bti3,bti4,bti5,bti6,bti7,bti8,bti9,bti10,bti11,bti12 ValuePerUnit: 60 Name: Blue Tiberium @@ -153,7 +155,7 @@ CRATE: Name: Crate Crate: Lifetime: 120 - TerrainTypes: Clear, Rough, Road, Ore, Beach + TerrainTypes: Clear, Rough, Road, Tiberium, BlueTiberium, Beach GiveCashCrateAction: Amount: 1000 SelectionShares: 50 diff --git a/mods/cnc/rules/trees.yaml b/mods/cnc/rules/trees.yaml index 3c0e5dfabf..965d7ffc01 100644 --- a/mods/cnc/rules/trees.yaml +++ b/mods/cnc/rules/trees.yaml @@ -8,7 +8,7 @@ SPLIT2: Name: Blossom Tree -Selectable: RadarColorFromTerrain: - Terrain: Ore + Terrain: Tiberium SPLIT3: Inherits: ^Tree @@ -20,7 +20,7 @@ SPLIT3: Name: Blossom Tree -Selectable: RadarColorFromTerrain: - Terrain: Ore + Terrain: Tiberium ROCK1: Inherits: ^Rock diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml index fad082dd57..ccb767cfe4 100644 --- a/mods/cnc/rules/vehicles.yaml +++ b/mods/cnc/rules/vehicles.yaml @@ -629,11 +629,9 @@ LST: Clear: 100% Rough: 100% Road: 100% - Tree: 100% Water: 100% - Rock: 100% - Wall: 100% - Ore: 100% + Tiberium: 100% + BlueTiberium: 100% Beach: 100% River: 100% InitialFacing:0 diff --git a/mods/cnc/tilesets/desert.yaml b/mods/cnc/tilesets/desert.yaml index 24e41c02b4..4f1f11efef 100644 --- a/mods/cnc/tilesets/desert.yaml +++ b/mods/cnc/tilesets/desert.yaml @@ -51,11 +51,16 @@ Terrain: Buildable: False AcceptSmudge: False Color: 176, 156, 120 - TerrainType@Ore: - Type: Ore + TerrainType@Tiberium: + Type: Tiberium Buildable: False AcceptSmudge: True Color: 161, 226, 28 + TerrainType@BlueTiberium: + Type: BlueTiberium + Buildable: False + AcceptSmudge: True + Color: 84, 252, 252 Templates: Template@255: diff --git a/mods/cnc/tilesets/snow.yaml b/mods/cnc/tilesets/snow.yaml index 36e7fc8de3..112f0ffad2 100644 --- a/mods/cnc/tilesets/snow.yaml +++ b/mods/cnc/tilesets/snow.yaml @@ -9,7 +9,7 @@ Terrain: Type: Clear Buildable: True AcceptSmudge: True - Color: 40, 68, 40 + Color: 196, 196, 196 TerrainType@Water: Type: Water IsWater: true @@ -51,11 +51,16 @@ Terrain: Buildable: False AcceptSmudge: False Color: 176, 156, 120 - TerrainType@Ore: - Type: Ore + TerrainType@Tiberium: + Type: Tiberium Buildable: False AcceptSmudge: True Color: 161, 226, 28 + TerrainType@BlueTiberium: + Type: BlueTiberium + Buildable: False + AcceptSmudge: True + Color: 84, 252, 252 Templates: Template@255: diff --git a/mods/cnc/tilesets/temperat.yaml b/mods/cnc/tilesets/temperat.yaml index 4e6bcd811a..627eb6f53c 100644 --- a/mods/cnc/tilesets/temperat.yaml +++ b/mods/cnc/tilesets/temperat.yaml @@ -51,11 +51,16 @@ Terrain: Buildable: False AcceptSmudge: False Color: 176, 156, 120 - TerrainType@Ore: - Type: Ore + TerrainType@Tiberium: + Type: Tiberium Buildable: False AcceptSmudge: True Color: 161, 226, 28 + TerrainType@BlueTiberium: + Type: BlueTiberium + Buildable: False + AcceptSmudge: True + Color: 84, 252, 252 Templates: Template@255: diff --git a/mods/cnc/tilesets/winter.yaml b/mods/cnc/tilesets/winter.yaml index 1989b41b80..c6f6b3422e 100644 --- a/mods/cnc/tilesets/winter.yaml +++ b/mods/cnc/tilesets/winter.yaml @@ -51,11 +51,16 @@ Terrain: Buildable: False AcceptSmudge: False Color: 176, 156, 120 - TerrainType@Ore: - Type: Ore + TerrainType@Tiberium: + Type: Tiberium Buildable: False AcceptSmudge: True Color: 161, 226, 28 + TerrainType@BlueTiberium: + Type: BlueTiberium + Buildable: False + AcceptSmudge: True + Color: 84, 252, 252 Templates: Template@255: