From 3a6989ce24a775ebbd14ff6785de453b9860e8c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Thu, 2 Jan 2014 17:55:13 +0100 Subject: [PATCH 01/10] removed redundant default mini bridges --- mods/ra/rules/civilian.yaml | 8 +++--- mods/ra/rules/defaults.yaml | 51 ------------------------------------- 2 files changed, 4 insertions(+), 55 deletions(-) diff --git a/mods/ra/rules/civilian.yaml b/mods/ra/rules/civilian.yaml index 5f3308755c..e8d23c7680 100644 --- a/mods/ra/rules/civilian.yaml +++ b/mods/ra/rules/civilian.yaml @@ -416,7 +416,7 @@ BRIDGE2: SpawnOffset: 2,1 SBRIDGE1: - Inherits: ^SVBridge + Inherits: ^Bridge Bridge: Template: 520 DamagedTemplate: 521 @@ -432,7 +432,7 @@ SBRIDGE1: SpawnOffset: 1,1 SBRIDGE2: - Inherits: ^SHBridge + Inherits: ^Bridge Bridge: Template: 531 DamagedTemplate: 532 @@ -448,7 +448,7 @@ SBRIDGE2: SpawnOffset: 1,1 SBRIDGE3: - Inherits: ^STDBridge + Inherits: ^Bridge Bridge: Template: 523 DamagedTemplate: 524 @@ -464,7 +464,7 @@ SBRIDGE3: SpawnOffset: 0,1 SBRIDGE4: - Inherits: ^STDBridge + Inherits: ^Bridge Bridge: Template: 527 DamagedTemplate: 528 diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 69cdf925c9..640dc9732c 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -463,57 +463,6 @@ BodyOrientation: LuaScriptEvents: -^SVBridge: - Tooltip: - Name: Small Bridge - BelowUnits: - TargetableBuilding: - TargetTypes: Ground, Water - Building: - Footprint: ___ ___ - Dimensions: 3,2 - Health: - HP: 750 - ProximityCaptor: - Types: Bridge - AutoTargetIgnore: - BodyOrientation: - LuaScriptEvents: - -^SHBridge: - Tooltip: - Name: Small Bridge - BelowUnits: - TargetableBuilding: - TargetTypes: Ground, Water - Building: - Footprint: __ __ __ - Dimensions: 2,3 - Health: - HP: 750 - ProximityCaptor: - Types: Bridge - AutoTargetIgnore: - BodyOrientation: - LuaScriptEvents: - -^STDBridge: - Tooltip: - Name: Small Bridge - BelowUnits: - TargetableBuilding: - TargetTypes: Ground, Water - Building: - Footprint: ____ ____ - Dimensions: 4,2 - Health: - HP: 750 - ProximityCaptor: - Types: Bridge - AutoTargetIgnore: - BodyOrientation: - LuaScriptEvents: - ^Rock: Tooltip: Name: Rock From 4b43bb1cad328327c08f73b50b5d20d804f085ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Thu, 2 Jan 2014 18:04:03 +0100 Subject: [PATCH 02/10] replace misleading Underwater bool with what it really does --- OpenRA.Game/GameRules/WeaponInfo.cs | 2 +- OpenRA.Mods.RA/Effects/Bullet.cs | 2 +- OpenRA.Mods.RA/Effects/Missile.cs | 2 +- mods/ra/weapons.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenRA.Game/GameRules/WeaponInfo.cs b/OpenRA.Game/GameRules/WeaponInfo.cs index 38c4730488..2aa17decf3 100644 --- a/OpenRA.Game/GameRules/WeaponInfo.cs +++ b/OpenRA.Game/GameRules/WeaponInfo.cs @@ -105,7 +105,7 @@ namespace OpenRA.GameRules public readonly int ROF = 1; public readonly int Burst = 1; public readonly bool Charges = false; - public readonly bool Underwater = false; + public readonly string Palette = "effect"; public readonly string[] ValidTargets = { "Ground", "Water" }; public readonly string[] InvalidTargets = { }; public readonly int BurstDelay = 5; diff --git a/OpenRA.Mods.RA/Effects/Bullet.cs b/OpenRA.Mods.RA/Effects/Bullet.cs index d8bce96716..28ef4a1139 100755 --- a/OpenRA.Mods.RA/Effects/Bullet.cs +++ b/OpenRA.Mods.RA/Effects/Bullet.cs @@ -143,7 +143,7 @@ namespace OpenRA.Mods.RA.Effects yield return r; } - var palette = wr.Palette(args.Weapon.Underwater ? "shadow" : "effect"); + var palette = wr.Palette(args.Weapon.Palette); foreach (var r in anim.Render(pos, palette)) yield return r; } diff --git a/OpenRA.Mods.RA/Effects/Missile.cs b/OpenRA.Mods.RA/Effects/Missile.cs index 4e55632ad1..6525ea01d3 100755 --- a/OpenRA.Mods.RA/Effects/Missile.cs +++ b/OpenRA.Mods.RA/Effects/Missile.cs @@ -184,7 +184,7 @@ namespace OpenRA.Mods.RA.Effects if (!args.SourceActor.World.FogObscures(pos.ToCPos())) { - var palette = wr.Palette(args.Weapon.Underwater ? "shadow" : "effect"); + var palette = wr.Palette(args.Weapon.Palette); foreach (var r in anim.Render(pos, palette)) yield return r; } diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml index 621cb343d6..390fa5ab9a 100644 --- a/mods/ra/weapons.yaml +++ b/mods/ra/weapons.yaml @@ -820,7 +820,7 @@ TorpTube: Range: 9c0 Report: TORPEDO1.AUD ValidTargets: Water, Underwater - Underwater: yes + Palette: shadow Burst: 2 BurstDelay: 20 Projectile: Missile From 027a281ae38c926688c43936fef3b18bd297da21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Thu, 2 Jan 2014 19:21:46 +0100 Subject: [PATCH 03/10] define torpedoes in a more generic way fixes #3252 and closes #2097 --- OpenRA.Game/GameRules/WeaponInfo.cs | 8 +------- OpenRA.Mods.RA/Effects/Missile.cs | 9 +++++++-- mods/ra/rules/defaults.yaml | 2 ++ mods/ra/weapons.yaml | 14 +++++++++----- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/OpenRA.Game/GameRules/WeaponInfo.cs b/OpenRA.Game/GameRules/WeaponInfo.cs index 2aa17decf3..b40405ceb2 100644 --- a/OpenRA.Game/GameRules/WeaponInfo.cs +++ b/OpenRA.Game/GameRules/WeaponInfo.cs @@ -179,13 +179,7 @@ namespace OpenRA.GameRules if (!world.Map.IsInMap(cell)) return false; - if (ValidTargets.Contains("Ground") && world.GetTerrainType(cell) != "Water") - return true; - - if (ValidTargets.Contains("Water") && world.GetTerrainType(cell) == "Water") - return true; - - return false; + return true; } return false; diff --git a/OpenRA.Mods.RA/Effects/Missile.cs b/OpenRA.Mods.RA/Effects/Missile.cs index 6525ea01d3..eac4983278 100755 --- a/OpenRA.Mods.RA/Effects/Missile.cs +++ b/OpenRA.Mods.RA/Effects/Missile.cs @@ -42,6 +42,8 @@ namespace OpenRA.Mods.RA.Effects public readonly bool ContrailUsePlayerColor = false; public readonly int ContrailDelay = 1; public readonly bool Jammable = true; + [Desc("Explodes when leaving the following terrain type, e.g., Water for torpedoes.")] + public readonly string BoundToTerrainType = ""; public IEffect Create(ProjectileArgs args) { return new Missile(this, args); } } @@ -153,11 +155,14 @@ namespace OpenRA.Mods.RA.Effects if (info.ContrailLength > 0) trail.Update(pos); + var cell = pos.ToCPos(); + var shouldExplode = (pos.Z < 0) // Hit the ground || (dist.LengthSquared < MissileCloseEnough.Range * MissileCloseEnough.Range) // Within range || (info.RangeLimit != 0 && ticks > info.RangeLimit) // Ran out of fuel - || (!info.High && world.ActorMap.GetUnitsAt(pos.ToCPos()) - .Any(a => a.HasTrait())); // Hit a wall + || (!info.High && world.ActorMap.GetUnitsAt(cell) + .Any(a => a.HasTrait())) // Hit a wall + || (!string.IsNullOrEmpty(info.BoundToTerrainType) && world.GetTerrainType(cell) != info.BoundToTerrainType); // Hit incompatible terrain if (shouldExplode) Explode(world); diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 640dc9732c..7e7bf5e408 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -459,6 +459,8 @@ HP: 1000 ProximityCaptor: Types: Bridge + Armor: + Type: Concrete AutoTargetIgnore: BodyOrientation: LuaScriptEvents: diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml index 390fa5ab9a..2a5c36c6a7 100644 --- a/mods/ra/weapons.yaml +++ b/mods/ra/weapons.yaml @@ -508,7 +508,7 @@ MammothTusk: Range: 8c0 Report: MISSILE6.AUD Burst: 2 - ValidTargets: Ground, Air + ValidTargets: Air, Ground, Water Projectile: Missile Speed: 341 Arm: 2 @@ -789,7 +789,7 @@ Stinger: Report: MISSILE6.AUD Burst: 2 BurstDelay: 0 - ValidTargets: Ground, Air + ValidTargets: Air, Ground, Water Projectile: Missile Arm: 3 High: true @@ -830,15 +830,18 @@ TorpTube: Trail: bubbles ROT: 1 RangeLimit: 160 + BoundToTerrainType: Water Warhead: - Spread: 128 + Spread: 426 Versus: None: 30% Wood: 75% Light: 75% - Concrete: 50% + Concrete: 500% WaterExplosion: large_splash WaterImpactSound: splash9.aud + Explosion: large_explosion + ImpactSound: kaboom12.aud InfDeath: 4 SmudgeType: Crater Damage: 180 @@ -1207,7 +1210,7 @@ FLAK-23: ROF: 10 Range: 8c0 Report: AACANON3.AUD - ValidTargets: Air,Ground + ValidTargets: Air, Ground, Water Projectile: Bullet Speed: 1c682 High: true @@ -1220,6 +1223,7 @@ FLAK-23: Heavy: 10% Concrete: 20% Explosion: small_explosion_air + WaterExplosion: small_splash Damage: 20 Sniper: From 9730b41162df67d1c8763fb81d894c88b24df9ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Thu, 2 Jan 2014 22:28:13 +0100 Subject: [PATCH 04/10] update CHANGELOG --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index a439780d9b..22eedc77d0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,8 @@ NEW: Added randomized tiles for Sand and Rock terrain. Red Alert: Tanya can now plant C4 on bridges. + Submarine torpedoes can now hit bridges when force fired. + Increased torpedo splash damage and raised multiplier vs. concrete. Tiberian Dawn: Commando can now plant C4 on bridges. Engine: From e3a2addca01be61976fee30c0562aacc0baa5caa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Fri, 3 Jan 2014 13:17:41 +0100 Subject: [PATCH 05/10] new Bridge terrain type with grey minimap color --- mods/ra/rules/defaults.yaml | 3 ++ mods/ra/tilesets/desert.yaml | 68 ++++++++++++++++++---------------- mods/ra/tilesets/snow.yaml | 44 ++++++++++++---------- mods/ra/tilesets/temperat.yaml | 64 +++++++++++++++++--------------- 4 files changed, 97 insertions(+), 82 deletions(-) diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 7e7bf5e408..94daf16230 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -6,6 +6,7 @@ Clear: 80 Rough: 40 Road: 100 + Bridge: 100 Ore: 70 Gems: 70 Beach: 40 @@ -53,6 +54,7 @@ Clear: 80 Rough: 70 Road: 100 + Bridge: 100 Ore: 70 Gems: 70 Beach: 70 @@ -107,6 +109,7 @@ Clear: 90 Rough: 80 Road: 100 + Bridge: 100 Ore: 80 Gems: 80 Beach: 80 diff --git a/mods/ra/tilesets/desert.yaml b/mods/ra/tilesets/desert.yaml index d43c9a3641..a684a0a685 100644 --- a/mods/ra/tilesets/desert.yaml +++ b/mods/ra/tilesets/desert.yaml @@ -24,6 +24,10 @@ Terrain: Buildable: True AcceptsSmudgeType: Crater, Scorch Color: 168, 123, 83 + TerrainType@Bridge: + Type: Bridge + AcceptsSmudgeType: Crater, Scorch + Color: 96, 96, 96 TerrainType@Rock: Type: Rock Buildable: False @@ -2816,11 +2820,11 @@ Templates: Category: Bridge Tiles: 0: Rock - 1: Road - 2: Road + 1: Bridge + 2: Bridge 3: Rock - 4: Road - 5: Road + 4: Bridge + 5: Bridge 6: Rock 7: Rock Template@621: @@ -2830,11 +2834,11 @@ Templates: Category: Bridge Tiles: 0: Rock - 1: Road - 2: Road + 1: Bridge + 2: Bridge 3: Rock - 4: Road - 5: Road + 4: Bridge + 5: Bridge 6: Rock 7: Rock Template@622: @@ -2879,13 +2883,13 @@ Templates: Category: Bridge Tiles: 0: Rock - 1: Road - 2: Road + 1: Bridge + 2: Bridge 3: Rock 4: Rock 5: Rock - 6: Road - 7: Road + 6: Bridge + 7: Bridge Template@625: Id: 625 Image: bridge2h @@ -2893,13 +2897,13 @@ Templates: Category: Bridge Tiles: 0: Rock - 1: Road - 2: Road + 1: Bridge + 2: Bridge 3: Rock 4: Rock 5: Rock - 6: Road - 7: Road + 6: Bridge + 7: Bridge Template@626: Id: 626 Image: bridge2d @@ -2942,10 +2946,10 @@ Templates: Category: Bridge Tiles: 0: Rock - 1: Road - 2: Road + 1: Bridge + 2: Bridge 3: Rock - 5: Road + 5: Bridge 6: Rock 7: River Template@236: @@ -2955,10 +2959,10 @@ Templates: Category: Bridge Tiles: 0: Rock - 1: Road - 2: Road + 1: Bridge + 2: Bridge 3: Rock - 5: Road + 5: Bridge 6: Rock 7: River Template@237: @@ -2981,9 +2985,9 @@ Templates: Category: Bridge Tiles: 0: Rock - 1: Road - 4: Road - 5: Road + 1: Bridge + 4: Bridge + 5: Bridge 6: Rock 7: Rock Template@239: @@ -2993,9 +2997,9 @@ Templates: Category: Bridge Tiles: 0: Rock - 1: Road - 4: Road - 5: Road + 1: Bridge + 4: Bridge + 5: Bridge 6: Rock 7: Rock Template@240: @@ -3017,8 +3021,8 @@ Templates: Category: Bridge Tiles: 0: Rock - 1: Road - 5: Road + 1: Bridge + 5: Bridge 6: Rock 7: Rock Template@242: @@ -3028,8 +3032,8 @@ Templates: Category: Bridge Tiles: 0: Rock - 1: Road - 5: Road + 1: Bridge + 5: Bridge 6: Rock 7: Rock Template@243: diff --git a/mods/ra/tilesets/snow.yaml b/mods/ra/tilesets/snow.yaml index 255f14e890..386eec6e44 100644 --- a/mods/ra/tilesets/snow.yaml +++ b/mods/ra/tilesets/snow.yaml @@ -19,6 +19,10 @@ Terrain: Type: Road AcceptsSmudgeType: Crater, Scorch Color: 88, 116, 116 + TerrainType@Bridge: + Type: Bridge + AcceptsSmudgeType: Crater, Scorch + Color: 96, 96, 96 TerrainType@Rock: Type: Rock AcceptsSmudgeType: @@ -2487,12 +2491,12 @@ Templates: Category: Bridge Tiles: 1: Rock - 2: Road + 2: Bridge 4: Rock - 5: Road - 6: Road + 5: Bridge + 6: Bridge 7: Rock - 9: Road + 9: Bridge 10: Rock 11: Rock Template@236: @@ -2532,13 +2536,13 @@ Templates: Category: Bridge Tiles: 1: Rock - 2: Road + 2: Bridge 5: Rock - 6: Road - 7: Road + 6: Bridge + 7: Bridge 8: Rock 9: Rock - 11: Road + 11: Bridge 12: Rock 13: Rock Template@239: @@ -2580,8 +2584,8 @@ Templates: Category: Bridge Tiles: 0: Rock - 1: Road - 5: Road + 1: Bridge + 5: Bridge 6: Rock 7: Rock Template@242: @@ -2591,8 +2595,8 @@ Templates: Category: Bridge Tiles: 0: Rock - 1: Road - 5: Road + 1: Bridge + 5: Bridge 6: Rock 7: Rock Template@243: @@ -2665,12 +2669,12 @@ Templates: Category: Bridge Tiles: 1: Rock - 2: Road - 3: Road + 2: Bridge + 3: Bridge 4: Rock 5: Rock - 6: Road - 7: Road + 6: Bridge + 7: Bridge 8: Rock 9: Rock 12: Rock @@ -2727,13 +2731,13 @@ Templates: Category: Bridge Tiles: 0: Rock - 1: Road - 2: Road + 1: Bridge + 2: Bridge 3: Rock 5: Rock 6: Rock - 7: Road - 8: Road + 7: Bridge + 8: Bridge 9: Rock Template@134: Id: 134 diff --git a/mods/ra/tilesets/temperat.yaml b/mods/ra/tilesets/temperat.yaml index ae7bb37b6d..da403076a1 100644 --- a/mods/ra/tilesets/temperat.yaml +++ b/mods/ra/tilesets/temperat.yaml @@ -19,6 +19,10 @@ Terrain: Type: Road AcceptsSmudgeType: Crater, Scorch Color: 88, 116, 116 + TerrainType@Bridge: + Type: Bridge + AcceptsSmudgeType: Crater, Scorch + Color: 96, 96, 96 TerrainType@Rock: Type: Rock AcceptsSmudgeType: @@ -2489,12 +2493,12 @@ Templates: Category: Bridge Tiles: 1: Rock - 2: Road + 2: Bridge 4: Rock - 5: Road - 6: Road + 5: Bridge + 6: Bridge 7: Rock - 9: Road + 9: Bridge 10: Rock 11: Rock Template@236: @@ -2534,13 +2538,13 @@ Templates: Category: Bridge Tiles: 1: Rock - 2: Road + 2: Bridge 5: Rock - 6: Road - 7: Road + 6: Bridge + 7: Bridge 8: Rock 9: Rock - 11: Road + 11: Bridge 12: Rock 13: Rock Template@239: @@ -2582,8 +2586,8 @@ Templates: Category: Bridge Tiles: 0: Rock - 1: Road - 5: Road + 1: Bridge + 5: Bridge 6: Rock 7: Rock Template@242: @@ -2593,8 +2597,8 @@ Templates: Category: Bridge Tiles: 0: Rock - 1: Road - 5: Road + 1: Bridge + 5: Bridge 6: Rock 7: Rock Template@243: @@ -2667,12 +2671,12 @@ Templates: Category: Bridge Tiles: 1: Rock - 2: Road - 3: Road + 2: Bridge + 3: Bridge 4: Rock 5: Rock - 6: Road - 7: Road + 6: Bridge + 7: Bridge 8: Rock 9: Rock 12: Rock @@ -2715,11 +2719,11 @@ Templates: Category: Bridge Tiles: 2: Clear - 3: Road - 4: Road + 3: Bridge + 4: Bridge 5: Rock - 15: Road - 16: Road + 15: Bridge + 16: Bridge 18: Rock 19: Rock Template@133: @@ -2729,13 +2733,13 @@ Templates: Category: Bridge Tiles: 0: Rock - 1: Road - 2: Road + 1: Bridge + 2: Bridge 3: Rock 5: Rock 6: Rock - 7: Road - 8: Road + 7: Bridge + 8: Bridge 9: Rock Template@134: Id: 134 @@ -2773,8 +2777,8 @@ Templates: Size: 5,5 Category: Bridge Tiles: - 0: Road - 1: Road + 0: Bridge + 1: Bridge 2: Rough 3: Clear 4: Rough @@ -2782,10 +2786,10 @@ Templates: 15: Rock 16: Rock 17: Rough - 18: Road - 19: Road - 23: Road - 24: Road + 18: Bridge + 19: Bridge + 23: Bridge + 24: Bridge Template@247: Id: 247 Image: f01 From 3de151674734f2018844edb95484b8f51ce6c30d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Fri, 3 Jan 2014 13:18:53 +0100 Subject: [PATCH 06/10] allow invalid terrain targets for Air/Water bound weapons made terrain targeting consistent with actors --- OpenRA.FileFormats/Map/TileSet.cs | 3 ++- OpenRA.Game/GameRules/WeaponInfo.cs | 5 +++++ OpenRA.Utility/UpgradeRules.cs | 29 +++++++++++++++++++++++++ mods/cnc/tilesets/desert.yaml | 11 ++++++++++ mods/cnc/tilesets/snow.yaml | 12 +++++++++++ mods/cnc/tilesets/temperat.yaml | 14 +++++++++++- mods/cnc/tilesets/winter.yaml | 14 +++++++++++- mods/d2k/tilesets/arrakis.yaml | 10 +++++++++ mods/ra/tilesets/desert.yaml | 14 ++++++++++++ mods/ra/tilesets/interior.yaml | 11 ++++++++++ mods/ra/tilesets/snow.yaml | 13 ++++++++++++ mods/ra/tilesets/temperat.yaml | 33 ++++++++++++++++++++--------- mods/ra/weapons.yaml | 10 ++++----- mods/ts/tilesets/interior.yaml | 2 ++ 14 files changed, 163 insertions(+), 18 deletions(-) diff --git a/OpenRA.FileFormats/Map/TileSet.cs b/OpenRA.FileFormats/Map/TileSet.cs index 2e9dccb954..8e3aaeb314 100644 --- a/OpenRA.FileFormats/Map/TileSet.cs +++ b/OpenRA.FileFormats/Map/TileSet.cs @@ -18,8 +18,9 @@ namespace OpenRA.FileFormats public class TerrainTypeInfo { public string Type; + public string[] TargetTypes = { }; public string[] AcceptsSmudgeType = { }; - public bool IsWater = false; + public bool IsWater = false; // TODO: Remove this public Color Color; public string CustomCursor; diff --git a/OpenRA.Game/GameRules/WeaponInfo.cs b/OpenRA.Game/GameRules/WeaponInfo.cs index b40405ceb2..d46d7c7a90 100644 --- a/OpenRA.Game/GameRules/WeaponInfo.cs +++ b/OpenRA.Game/GameRules/WeaponInfo.cs @@ -179,6 +179,11 @@ namespace OpenRA.GameRules if (!world.Map.IsInMap(cell)) return false; + var cellInfo = world.GetTerrainInfo(cell); + if (!ValidTargets.Intersect(cellInfo.TargetTypes).Any() + || InvalidTargets.Intersect(cellInfo.TargetTypes).Any()) + return false; + return true; } diff --git a/OpenRA.Utility/UpgradeRules.cs b/OpenRA.Utility/UpgradeRules.cs index b05cd084d9..fd1401d6c9 100644 --- a/OpenRA.Utility/UpgradeRules.cs +++ b/OpenRA.Utility/UpgradeRules.cs @@ -159,6 +159,24 @@ namespace OpenRA.Utility } } + static void UpgradeTileset(int engineVersion, ref List nodes, MiniYamlNode parent, int depth) + { + var parentKey = parent != null ? parent.Key.Split('@').First() : null; + List addNodes = new List(); + + foreach (var node in nodes) + { + if (engineVersion < 20140104) + { + if (depth == 2 && parentKey == "TerrainType" && node.Key.Split('@').First() == "Type") + addNodes.Add(new MiniYamlNode("TargetTypes", node.Value.Value == "Water" ? "Water" : "Ground")); + } + UpgradeTileset(engineVersion, ref node.Value.Nodes, node, depth + 1); + } + + nodes.AddRange(addNodes); + } + [Desc("MAP", "CURRENTENGINE", "Upgrade map rules to the latest engine version.")] public static void UpgradeMap(string[] args) { @@ -201,6 +219,17 @@ namespace OpenRA.Utility file.WriteLine(yaml.WriteToString()); } + Console.WriteLine("Processing Tilesets:"); + foreach (var filename in Game.modData.Manifest.TileSets) + { + Console.WriteLine("\t" + filename); + var yaml = MiniYaml.FromFile(filename); + UpgradeTileset(engineDate, ref yaml, null, 0); + + using (var file = new StreamWriter(filename)) + file.WriteLine(yaml.WriteToString()); + } + Console.WriteLine("Processing Maps:"); foreach (var map in Game.modData.FindMaps().Values) { diff --git a/mods/cnc/tilesets/desert.yaml b/mods/cnc/tilesets/desert.yaml index 900f389be8..a53857d2cf 100644 --- a/mods/cnc/tilesets/desert.yaml +++ b/mods/cnc/tilesets/desert.yaml @@ -10,47 +10,58 @@ Terrain: Type: Clear AcceptsSmudgeType: Crater, Scorch Color: 134, 95, 69 + TargetTypes: Ground TerrainType@Water: Type: Water IsWater: true AcceptsSmudgeType: Color: 93, 165, 206 + TargetTypes: Water TerrainType@Road: Type: Road AcceptsSmudgeType: Crater, Scorch Color: 168, 123, 83 + TargetTypes: Ground TerrainType@Rock: Type: Rock AcceptsSmudgeType: Color: 116, 90, 63 + TargetTypes: Ground TerrainType@Tree: Type: Tree AcceptsSmudgeType: Color: 28, 32, 36 + TargetTypes: Ground TerrainType@River: Type: River AcceptsSmudgeType: Color: 111, 132, 139 + TargetTypes: Ground TerrainType@Rough: Type: Rough AcceptsSmudgeType: Crater, Scorch Color: 68, 68, 60 + TargetTypes: Ground TerrainType@Wall: Type: Wall AcceptsSmudgeType: Crater, Scorch Color: 208, 192, 160 + TargetTypes: Ground TerrainType@Beach: Type: Beach AcceptsSmudgeType: Color: 176, 156, 120 + TargetTypes: Ground TerrainType@Tiberium: Type: Tiberium AcceptsSmudgeType: Crater, Scorch Color: 161, 226, 28 + TargetTypes: Ground TerrainType@BlueTiberium: Type: BlueTiberium AcceptsSmudgeType: Crater, Scorch Color: 84, 252, 252 + TargetTypes: Ground Templates: Template@255: diff --git a/mods/cnc/tilesets/snow.yaml b/mods/cnc/tilesets/snow.yaml index a91c54587e..5491867db1 100644 --- a/mods/cnc/tilesets/snow.yaml +++ b/mods/cnc/tilesets/snow.yaml @@ -10,47 +10,58 @@ Terrain: Type: Clear AcceptsSmudgeType: Crater, Scorch Color: 196, 196, 196 + TargetTypes: Ground TerrainType@Water: Type: Water IsWater: true AcceptsSmudgeType: Color: 92, 116, 164 + TargetTypes: Water TerrainType@Road: Type: Road AcceptsSmudgeType: Crater, Scorch Color: 88, 116, 116 + TargetTypes: Ground TerrainType@Rock: Type: Rock AcceptsSmudgeType: Color: 68, 68, 60 + TargetTypes: Ground TerrainType@Tree: Type: Tree AcceptsSmudgeType: Color: 28, 32, 36 + TargetTypes: Ground TerrainType@River: Type: River AcceptsSmudgeType: Color: 92, 140, 180 + TargetTypes: Ground TerrainType@Rough: Type: Rough AcceptsSmudgeType: Crater, Scorch Color: 68, 68, 60 + TargetTypes: Ground TerrainType@Wall: Type: Wall AcceptsSmudgeType: Crater, Scorch Color: 208, 192, 160 + TargetTypes: Ground TerrainType@Beach: Type: Beach AcceptsSmudgeType: Color: 176, 156, 120 + TargetTypes: Ground TerrainType@Tiberium: Type: Tiberium AcceptsSmudgeType: Crater, Scorch Color: 161, 226, 28 + TargetTypes: Ground TerrainType@BlueTiberium: Type: BlueTiberium AcceptsSmudgeType: Crater, Scorch Color: 84, 252, 252 + TargetTypes: Ground Templates: Template@255: @@ -1321,3 +1332,4 @@ Templates: 3: Water 4: River 6: Water + diff --git a/mods/cnc/tilesets/temperat.yaml b/mods/cnc/tilesets/temperat.yaml index 570024a2d6..3ece050dbb 100644 --- a/mods/cnc/tilesets/temperat.yaml +++ b/mods/cnc/tilesets/temperat.yaml @@ -10,47 +10,58 @@ Terrain: Type: Clear AcceptsSmudgeType: Crater, Scorch Color: 40, 68, 40 + TargetTypes: Ground TerrainType@Water: Type: Water IsWater: true AcceptsSmudgeType: Color: 92, 116, 164 + TargetTypes: Water TerrainType@Road: Type: Road AcceptsSmudgeType: Crater, Scorch Color: 88, 116, 116 + TargetTypes: Ground TerrainType@Rock: Type: Rock AcceptsSmudgeType: Color: 68, 68, 60 + TargetTypes: Ground TerrainType@Tree: Type: Tree AcceptsSmudgeType: Color: 28, 32, 36 + TargetTypes: Ground TerrainType@River: Type: River AcceptsSmudgeType: Color: 92, 140, 180 + TargetTypes: Ground TerrainType@Rough: Type: Rough AcceptsSmudgeType: Crater, Scorch Color: 68, 68, 60 + TargetTypes: Ground TerrainType@Wall: Type: Wall AcceptsSmudgeType: Crater, Scorch Color: 208, 192, 160 + TargetTypes: Ground TerrainType@Beach: Type: Beach AcceptsSmudgeType: Color: 176, 156, 120 + TargetTypes: Ground TerrainType@Tiberium: Type: Tiberium AcceptsSmudgeType: Crater, Scorch Color: 161, 226, 28 + TargetTypes: Ground TerrainType@BlueTiberium: Type: BlueTiberium AcceptsSmudgeType: Crater, Scorch Color: 84, 252, 252 + TargetTypes: Ground Templates: Template@255: @@ -1332,4 +1343,5 @@ Templates: 7: Tree 3: Tree 2: Tree - 4: Tree \ No newline at end of file + 4: Tree + diff --git a/mods/cnc/tilesets/winter.yaml b/mods/cnc/tilesets/winter.yaml index 23e56cf7d6..9ccbedc55d 100644 --- a/mods/cnc/tilesets/winter.yaml +++ b/mods/cnc/tilesets/winter.yaml @@ -10,47 +10,58 @@ Terrain: Type: Clear AcceptsSmudgeType: Crater, Scorch Color: 40, 68, 40 + TargetTypes: Ground TerrainType@Water: Type: Water IsWater: true AcceptsSmudgeType: Color: 92, 116, 164 + TargetTypes: Water TerrainType@Road: Type: Road AcceptsSmudgeType: Crater, Scorch Color: 88, 116, 116 + TargetTypes: Ground TerrainType@Rock: Type: Rock AcceptsSmudgeType: Color: 68, 68, 60 + TargetTypes: Ground TerrainType@Tree: Type: Tree AcceptsSmudgeType: Color: 28, 32, 36 + TargetTypes: Ground TerrainType@River: Type: River AcceptsSmudgeType: Color: 92, 140, 180 + TargetTypes: Ground TerrainType@Rough: Type: Rough AcceptsSmudgeType: Crater, Scorch Color: 68, 68, 60 + TargetTypes: Ground TerrainType@Wall: Type: Wall AcceptsSmudgeType: Crater, Scorch Color: 208, 192, 160 + TargetTypes: Ground TerrainType@Beach: Type: Beach AcceptsSmudgeType: Color: 176, 156, 120 + TargetTypes: Ground TerrainType@Tiberium: Type: Tiberium AcceptsSmudgeType: Crater, Scorch Color: 161, 226, 28 + TargetTypes: Ground TerrainType@BlueTiberium: Type: BlueTiberium AcceptsSmudgeType: Crater, Scorch Color: 84, 252, 252 + TargetTypes: Ground Templates: Template@255: @@ -1326,4 +1337,5 @@ Templates: 1: River 3: Water 4: River - 6: Water \ No newline at end of file + 6: Water + diff --git a/mods/d2k/tilesets/arrakis.yaml b/mods/d2k/tilesets/arrakis.yaml index fe91d0c843..b0e29d62ce 100644 --- a/mods/d2k/tilesets/arrakis.yaml +++ b/mods/d2k/tilesets/arrakis.yaml @@ -9,52 +9,62 @@ Terrain: TerrainType@Clear: # TODO: workaround for the stupid WinForms editor Type: Clear Color: 0, 0, 0 + TargetTypes: Ground TerrainType@Sand: Type: Sand AcceptsSmudgeType: SandCrater IsWater: False Color: 255,208,192,160 + TargetTypes: Ground TerrainType@Transition: Type: Transition AcceptsSmudgeType: IsWater: False Color: 255,207,166,100 + TargetTypes: Ground TerrainType@Rock: Type: Rock AcceptsSmudgeType: RockCrater IsWater: False Color: 255,206,140,66 + TargetTypes: Ground TerrainType@Cliff: Type: Cliff AcceptsSmudgeType: IsWater: False Color: 255,74,41,16 + TargetTypes: Ground TerrainType@Rough: Type: Rough AcceptsSmudgeType: IsWater: False Color: 255,88,116,116 CustomCursor: move-rough + TargetTypes: Ground TerrainType@Concrete: Type: Concrete AcceptsSmudgeType: IsWater: False Color: 255,208,192,160 + TargetTypes: Ground TerrainType@Dune: Type: Dune AcceptsSmudgeType: IsWater: False Color: 255,239,222,140 + TargetTypes: Ground TerrainType@Spice: Type: Spice AcceptsSmudgeType: IsWater: False Color: 255,239,148,74 + TargetTypes: Ground TerrainType@Ice: Type: Ice AcceptsSmudgeType: IsWater: True Color: 255,255,255,255 + TargetTypes: Ground Templates: Template@0: diff --git a/mods/ra/tilesets/desert.yaml b/mods/ra/tilesets/desert.yaml index a684a0a685..c7307ff370 100644 --- a/mods/ra/tilesets/desert.yaml +++ b/mods/ra/tilesets/desert.yaml @@ -13,65 +13,78 @@ Terrain: Buildable: True AcceptsSmudgeType: Crater, Scorch Color: 134, 95, 69 + TargetTypes: Ground TerrainType@Water: Type: Water IsWater: true Buildable: False AcceptsSmudgeType: Color: 93, 165, 206 + TargetTypes: Water TerrainType@Road: Type: Road Buildable: True AcceptsSmudgeType: Crater, Scorch Color: 168, 123, 83 + TargetTypes: Ground TerrainType@Bridge: Type: Bridge AcceptsSmudgeType: Crater, Scorch Color: 96, 96, 96 + TargetTypes: Ground, Bridge TerrainType@Rock: Type: Rock Buildable: False AcceptsSmudgeType: Color: 116, 90, 63 + TargetTypes: Ground TerrainType@Tree: Type: Tree Buildable: False AcceptsSmudgeType: Color: 28, 32, 36 + TargetTypes: Ground TerrainType@Brush: Type: Brush Buildable: False AcceptsSmudgeType: Color: 28, 32, 36 + TargetTypes: Ground TerrainType@River: Type: River Buildable: False AcceptsSmudgeType: Color: 111, 132, 139 + TargetTypes: Ground TerrainType@Rough: Type: Rough Buildable: False AcceptsSmudgeType: Crater, Scorch Color: 68, 68, 60 + TargetTypes: Ground TerrainType@Wall: Type: Wall Buildable: False AcceptsSmudgeType: Crater, Scorch Color: 208, 192, 160 + TargetTypes: Ground TerrainType@Beach: Type: Beach Buildable: False AcceptsSmudgeType: Color: 176, 156, 120 + TargetTypes: Ground TerrainType@Ore: Type: Ore Buildable: False AcceptsSmudgeType: Crater, Scorch Color: 148, 128, 96 + TargetTypes: Ground TerrainType@Gems: Type: Gems AcceptsSmudgeType: Crater, Scorch Color: 132, 112, 255 + TargetTypes: Ground Templates: Template@255: @@ -3105,3 +3118,4 @@ Templates: 12: Rock 13: Rock 14: Rock + diff --git a/mods/ra/tilesets/interior.yaml b/mods/ra/tilesets/interior.yaml index 9f40b6d756..6c2d9108a3 100644 --- a/mods/ra/tilesets/interior.yaml +++ b/mods/ra/tilesets/interior.yaml @@ -9,47 +9,58 @@ Terrain: Type: Clear AcceptsSmudgeType: Crater, Scorch Color: 0, 0, 0 + TargetTypes: Ground TerrainType@Water: Type: Water IsWater: true AcceptsSmudgeType: Color: 92, 116, 164 + TargetTypes: Water TerrainType@Road: Type: Road AcceptsSmudgeType: Crater, Scorch Color: 88, 116, 116 + TargetTypes: Ground TerrainType@Rock: Type: Rock AcceptsSmudgeType: Color: 68, 68, 60 + TargetTypes: Ground TerrainType@Tree: Type: Tree AcceptsSmudgeType: Color: 28, 32, 36 + TargetTypes: Ground TerrainType@River: Type: River AcceptsSmudgeType: Color: 92, 140, 180 + TargetTypes: Ground TerrainType@Rough: Type: Rough AcceptsSmudgeType: Crater, Scorch Color: 68, 68, 60 + TargetTypes: Ground TerrainType@Wall: Type: Wall AcceptsSmudgeType: Crater, Scorch Color: 208, 192, 160 + TargetTypes: Ground TerrainType@Beach: Type: Beach AcceptsSmudgeType: Color: 176, 156, 120 + TargetTypes: Ground TerrainType@Ore: Type: Ore AcceptsSmudgeType: Crater, Scorch Color: 148, 128, 96 + TargetTypes: Ground TerrainType@Gems: Type: Gems AcceptsSmudgeType: Crater, Scorch Color: 132, 112, 255 + TargetTypes: Ground Templates: Template@255: diff --git a/mods/ra/tilesets/snow.yaml b/mods/ra/tilesets/snow.yaml index 386eec6e44..6da825e6a3 100644 --- a/mods/ra/tilesets/snow.yaml +++ b/mods/ra/tilesets/snow.yaml @@ -10,51 +10,63 @@ Terrain: Type: Clear AcceptsSmudgeType: Crater, Scorch Color: 196, 196, 196 + TargetTypes: Ground TerrainType@Water: Type: Water IsWater: true AcceptsSmudgeType: Color: 92, 116, 164 + TargetTypes: Water TerrainType@Road: Type: Road AcceptsSmudgeType: Crater, Scorch Color: 88, 116, 116 + TargetTypes: Ground TerrainType@Bridge: Type: Bridge AcceptsSmudgeType: Crater, Scorch Color: 96, 96, 96 + TargetTypes: Ground, Bridge TerrainType@Rock: Type: Rock AcceptsSmudgeType: Color: 68, 68, 60 + TargetTypes: Ground TerrainType@Tree: Type: Tree AcceptsSmudgeType: Color: 28, 32, 36 + TargetTypes: Ground TerrainType@River: Type: River AcceptsSmudgeType: Color: 92, 140, 180 + TargetTypes: Ground TerrainType@Rough: Type: Rough AcceptsSmudgeType: Crater, Scorch Color: 68, 68, 60 + TargetTypes: Ground TerrainType@Wall: Type: Wall AcceptsSmudgeType: Crater, Scorch Color: 208, 192, 160 + TargetTypes: Ground TerrainType@Beach: Type: Beach AcceptsSmudgeType: Color: 176, 156, 120 + TargetTypes: Ground TerrainType@Ore: Type: Ore AcceptsSmudgeType: Crater, Scorch Color: 148, 128, 96 + TargetTypes: Ground TerrainType@Gems: Type: Gems AcceptsSmudgeType: Crater, Scorch Color: 132, 112, 255 + TargetTypes: Ground Templates: Template@255: @@ -3141,3 +3153,4 @@ Templates: Tiles: 0: Rock 1: Rock + diff --git a/mods/ra/tilesets/temperat.yaml b/mods/ra/tilesets/temperat.yaml index da403076a1..a1456f5483 100644 --- a/mods/ra/tilesets/temperat.yaml +++ b/mods/ra/tilesets/temperat.yaml @@ -10,51 +10,63 @@ Terrain: Type: Clear AcceptsSmudgeType: Crater, Scorch Color: 40, 68, 40 + TargetTypes: Ground TerrainType@Water: Type: Water IsWater: true AcceptsSmudgeType: Color: 92, 116, 164 + TargetTypes: Water TerrainType@Road: Type: Road AcceptsSmudgeType: Crater, Scorch Color: 88, 116, 116 + TargetTypes: Ground TerrainType@Bridge: Type: Bridge AcceptsSmudgeType: Crater, Scorch Color: 96, 96, 96 + TargetTypes: Ground, Bridge TerrainType@Rock: Type: Rock AcceptsSmudgeType: Color: 68, 68, 60 + TargetTypes: Ground TerrainType@Tree: Type: Tree AcceptsSmudgeType: Color: 28, 32, 36 + TargetTypes: Ground TerrainType@River: Type: River AcceptsSmudgeType: Color: 92, 140, 180 + TargetTypes: Ground TerrainType@Rough: Type: Rough AcceptsSmudgeType: Crater, Scorch Color: 68, 68, 60 + TargetTypes: Ground TerrainType@Wall: Type: Wall AcceptsSmudgeType: Crater, Scorch Color: 208, 192, 160 + TargetTypes: Ground TerrainType@Beach: Type: Beach AcceptsSmudgeType: Color: 176, 156, 120 + TargetTypes: Ground TerrainType@Ore: Type: Ore AcceptsSmudgeType: Crater, Scorch Color: 148, 128, 96 + TargetTypes: Ground TerrainType@Gems: Type: Gems AcceptsSmudgeType: Crater, Scorch Color: 132, 112, 255 + TargetTypes: Ground Templates: Template@255: @@ -3225,7 +3237,7 @@ Templates: 0: River 1: Road 2: River - 3: River + 3: River 4: Road 5: River Category: Bridge @@ -3237,7 +3249,7 @@ Templates: 0: River 1: Road 2: River - 3: River + 3: River 4: Road 5: River Category: Bridge @@ -3249,7 +3261,7 @@ Templates: 0: River 1: Rock 2: River - 3: River + 3: River 4: Rock 5: River Category: Bridge @@ -3345,7 +3357,7 @@ Templates: 6: Rock 7: Rock Category: Bridge - Template@530 + Template@530: Id: 530 Image: sbridge4x Size: 5,5 @@ -3365,7 +3377,7 @@ Templates: 23: Clear 24: Road Category: Bridge - Template@531 + Template@531: Id: 531 Image: sbridge2 Size: 2,3 @@ -3377,7 +3389,7 @@ Templates: 4: Rock 5: Rock Category: Bridge - Template@532 + Template@532: Id: 532 Image: sbridge2h Size: 2,3 @@ -3389,7 +3401,7 @@ Templates: 4: Rock 5: Rock Category: Bridge - Template@533 + Template@533: Id: 533 Image: sbridge2d Size: 2,3 @@ -3401,7 +3413,7 @@ Templates: 4: River 5: River Category: Bridge - Template@534 + Template@534: Id: 534 Image: sbridge2x Size: 4,4 @@ -3533,7 +3545,7 @@ Templates: Size: 1,1 Tiles: 0: Rough - Category: Debris + Category: Debris Template@583: Id: 583 Image: decc @@ -3603,4 +3615,5 @@ Templates: 3: Rough 4: Rough 5: Clear - Category: Debris \ No newline at end of file + Category: Debris + diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml index 2a5c36c6a7..1b36ee6a44 100644 --- a/mods/ra/weapons.yaml +++ b/mods/ra/weapons.yaml @@ -120,7 +120,7 @@ Maverick: Report: MISSILE7.AUD Burst: 2 BurstDelay: 7 - ValidTargets: Ground + ValidTargets: Ground, Water Projectile: Missile Speed: 256 Arm: 2 @@ -277,7 +277,7 @@ Dragon: ROF: 50 Range: 5c0 Report: MISSILE6.AUD - ValidTargets: Ground + ValidTargets: Ground, Water Projectile: Missile Speed: 213 Arm: 2 @@ -310,7 +310,7 @@ HellfireAG: Report: MISSILE6.AUD Burst: 2 BurstDelay: 10 - ValidTargets: Ground + ValidTargets: Ground, Water Projectile: Missile Speed: 256 Arm: 2 @@ -819,7 +819,7 @@ TorpTube: ROF: 100 Range: 9c0 Report: TORPEDO1.AUD - ValidTargets: Water, Underwater + ValidTargets: Water, Underwater, Bridge Palette: shadow Burst: 2 BurstDelay: 20 @@ -1247,7 +1247,7 @@ ChronoTusk: ROF: 60 Range: 6c0 Report: MISSILE6.AUD - ValidTargets: Ground + ValidTargets: Ground, Water Projectile: Missile Speed: 298 Arm: 2 diff --git a/mods/ts/tilesets/interior.yaml b/mods/ts/tilesets/interior.yaml index 0c02a60058..6a59d411dd 100644 --- a/mods/ts/tilesets/interior.yaml +++ b/mods/ts/tilesets/interior.yaml @@ -9,6 +9,7 @@ Terrain: Type: Clear AcceptsSmudgeType: Crater, Scorch Color: 0, 0, 0 + TargetTypes: Ground Templates: Template@255: @@ -17,3 +18,4 @@ Templates: Size: 1,1 Tiles: 0: Clear + From 4d99f9ce5325786f2c5f81c63f2e725f5d38e8b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Fri, 3 Jan 2014 13:24:09 +0100 Subject: [PATCH 07/10] allow to C4 intact bridges that have taken some damage --- OpenRA.Mods.RA/BridgeHut.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenRA.Mods.RA/BridgeHut.cs b/OpenRA.Mods.RA/BridgeHut.cs index 51cd186196..1a51e44472 100644 --- a/OpenRA.Mods.RA/BridgeHut.cs +++ b/OpenRA.Mods.RA/BridgeHut.cs @@ -38,7 +38,7 @@ namespace OpenRA.Mods.RA public bool IsValidTarget(Actor self, Actor saboteur) { - return BridgeDamageState == DamageState.Undamaged; + return BridgeDamageState != DamageState.Dead; } public DamageState BridgeDamageState { get { return bridge.AggregateDamageState(); } } From a6c5b80731dd14b31a0be58f9ac342153846bcbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Fri, 3 Jan 2014 13:30:12 +0100 Subject: [PATCH 08/10] this is not just ShowMuzzles anymore --- OpenRA.Game/Traits/Player/DeveloperMode.cs | 6 +++--- OpenRA.Mods.RA/CombatDebugOverlay.cs | 2 +- OpenRA.Mods.RA/Widgets/Logic/CheatsLogic.cs | 8 ++++---- mods/cnc/chrome/cheats.yaml | 2 +- mods/ra/chrome/cheats.yaml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) mode change 100755 => 100644 OpenRA.Mods.RA/CombatDebugOverlay.cs diff --git a/OpenRA.Game/Traits/Player/DeveloperMode.cs b/OpenRA.Game/Traits/Player/DeveloperMode.cs index af34cbc68d..b700326a38 100644 --- a/OpenRA.Game/Traits/Player/DeveloperMode.cs +++ b/OpenRA.Game/Traits/Player/DeveloperMode.cs @@ -19,7 +19,7 @@ namespace OpenRA.Traits public bool PathDebug = false; public bool UnlimitedPower; public bool BuildAnywhere; - public bool ShowMuzzles; + public bool ShowCombatGeometry; public bool ShowDebugGeometry; public object Create (ActorInitializer init) { return new DeveloperMode(this); } @@ -37,7 +37,7 @@ namespace OpenRA.Traits [Sync] public bool BuildAnywhere; // Client size only - public bool ShowMuzzles; + public bool ShowCombatGeometry; public bool ShowDebugGeometry; public DeveloperMode(DeveloperModeInfo info) @@ -49,7 +49,7 @@ namespace OpenRA.Traits PathDebug = info.PathDebug; UnlimitedPower = info.UnlimitedPower; BuildAnywhere = info.BuildAnywhere; - ShowMuzzles = info.ShowMuzzles; + ShowCombatGeometry = info.ShowCombatGeometry; ShowDebugGeometry = info.ShowDebugGeometry; } diff --git a/OpenRA.Mods.RA/CombatDebugOverlay.cs b/OpenRA.Mods.RA/CombatDebugOverlay.cs old mode 100755 new mode 100644 index 29d50c0580..103a032cf3 --- a/OpenRA.Mods.RA/CombatDebugOverlay.cs +++ b/OpenRA.Mods.RA/CombatDebugOverlay.cs @@ -38,7 +38,7 @@ namespace OpenRA.Mods.RA public void RenderAfterWorld(WorldRenderer wr, Actor self) { - if (devMode == null || !devMode.ShowMuzzles) + if (devMode == null || !devMode.ShowCombatGeometry) return; if (health.Value != null) diff --git a/OpenRA.Mods.RA/Widgets/Logic/CheatsLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/CheatsLogic.cs index 87675980ea..7fd5e9e7ae 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/CheatsLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/CheatsLogic.cs @@ -57,11 +57,11 @@ namespace OpenRA.Mods.RA.Widgets.Logic fastChargeCheckbox.OnClick = () => Order(world, "DevFastCharge"); } - var showMuzzlesCheckbox = widget.GetOrNull("SHOW_MUZZLES"); - if (showMuzzlesCheckbox != null) + var showCombatCheckbox = widget.GetOrNull("SHOW_COMBATOVERLAY"); + if (showCombatCheckbox != null) { - showMuzzlesCheckbox.IsChecked = () => devTrait.ShowMuzzles; - showMuzzlesCheckbox.OnClick = () => devTrait.ShowMuzzles ^= true; + showCombatCheckbox.IsChecked = () => devTrait.ShowCombatGeometry; + showCombatCheckbox.OnClick = () => devTrait.ShowCombatGeometry ^= true; } var showGeometryCheckbox = widget.GetOrNull("SHOW_GEOMETRY"); diff --git a/mods/cnc/chrome/cheats.yaml b/mods/cnc/chrome/cheats.yaml index 40001cae4d..7be077c94e 100644 --- a/mods/cnc/chrome/cheats.yaml +++ b/mods/cnc/chrome/cheats.yaml @@ -101,7 +101,7 @@ Container@CHEATS_PANEL: Width:200 Font:Regular Text:Show A* Cost - Checkbox@SHOW_MUZZLES: + Checkbox@SHOW_COMBATOVERLAY: X:290 Y:235 Height:20 diff --git a/mods/ra/chrome/cheats.yaml b/mods/ra/chrome/cheats.yaml index f3a600fc9f..fcb9c6bc1d 100644 --- a/mods/ra/chrome/cheats.yaml +++ b/mods/ra/chrome/cheats.yaml @@ -81,7 +81,7 @@ Background@CHEATS_PANEL: Width:PARENT_RIGHT - 30 Height:20 Text:Show A* Cost - Checkbox@SHOW_MUZZLES: + Checkbox@SHOW_COMBATOVERLAY: X:30 Y:350 Height:20 From 3ced83e94e0a23f1d866048a9521dd2134b41601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 4 Jan 2014 09:31:26 +0100 Subject: [PATCH 09/10] temperate roads should be brown in the minimap --- mods/ra/tilesets/temperat.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ra/tilesets/temperat.yaml b/mods/ra/tilesets/temperat.yaml index a1456f5483..c4b59b0e95 100644 --- a/mods/ra/tilesets/temperat.yaml +++ b/mods/ra/tilesets/temperat.yaml @@ -20,7 +20,7 @@ Terrain: TerrainType@Road: Type: Road AcceptsSmudgeType: Crater, Scorch - Color: 88, 116, 116 + Color: 94, 67, 13 TargetTypes: Ground TerrainType@Bridge: Type: Bridge From 7e437c620c7edbab0ec484b07e67acf03245e2f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 4 Jan 2014 09:56:34 +0100 Subject: [PATCH 10/10] remove unused interior terrain types no smudges on high walls --- mods/ra/tilesets/interior.yaml | 35 ++-------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/mods/ra/tilesets/interior.yaml b/mods/ra/tilesets/interior.yaml index 6c2d9108a3..1e7481a577 100644 --- a/mods/ra/tilesets/interior.yaml +++ b/mods/ra/tilesets/interior.yaml @@ -10,46 +10,15 @@ Terrain: AcceptsSmudgeType: Crater, Scorch Color: 0, 0, 0 TargetTypes: Ground - TerrainType@Water: - Type: Water - IsWater: true - AcceptsSmudgeType: - Color: 92, 116, 164 - TargetTypes: Water - TerrainType@Road: - Type: Road - AcceptsSmudgeType: Crater, Scorch - Color: 88, 116, 116 - TargetTypes: Ground - TerrainType@Rock: - Type: Rock - AcceptsSmudgeType: - Color: 68, 68, 60 - TargetTypes: Ground - TerrainType@Tree: + TerrainType@Tree: # and Boxes Type: Tree AcceptsSmudgeType: Color: 28, 32, 36 TargetTypes: Ground - TerrainType@River: - Type: River - AcceptsSmudgeType: - Color: 92, 140, 180 - TargetTypes: Ground - TerrainType@Rough: - Type: Rough - AcceptsSmudgeType: Crater, Scorch - Color: 68, 68, 60 - TargetTypes: Ground TerrainType@Wall: Type: Wall - AcceptsSmudgeType: Crater, Scorch - Color: 208, 192, 160 - TargetTypes: Ground - TerrainType@Beach: - Type: Beach AcceptsSmudgeType: - Color: 176, 156, 120 + Color: 208, 192, 160 TargetTypes: Ground TerrainType@Ore: Type: Ore