From 099aed6e14e95cbcc6c56673124ce267923e503e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Mon, 19 Aug 2013 21:01:44 +0200 Subject: [PATCH 1/4] StyleCop clean LintBuildable --- OpenRA.Mods.RA/Lint/LintBuildablePrerequisites.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/OpenRA.Mods.RA/Lint/LintBuildablePrerequisites.cs b/OpenRA.Mods.RA/Lint/LintBuildablePrerequisites.cs index c615167fd3..fd2ac1274e 100644 --- a/OpenRA.Mods.RA/Lint/LintBuildablePrerequisites.cs +++ b/OpenRA.Mods.RA/Lint/LintBuildablePrerequisites.cs @@ -20,17 +20,18 @@ namespace OpenRA.Mods.RA public void Run(Action emitError, Action emitWarning) { var providedPrereqs = Rules.Info.Keys.Concat( - Rules.Info.SelectMany( a => a.Value.Traits + Rules.Info.SelectMany(a => a.Value.Traits .WithInterface() - .Select( p => p.Prerequisite ))).ToArray(); + .Select(p => p.Prerequisite))).ToArray(); - foreach( var i in Rules.Info ) + // TODO: this check is case insensitive while the real check in-game is not + foreach (var i in Rules.Info) { var bi = i.Value.Traits.GetOrDefault(); if (bi != null) - foreach( var prereq in bi.Prerequisites ) - if ( !providedPrereqs.Contains(prereq.Replace("!","")) ) - emitError( "Buildable actor {0} has prereq {1} not provided by anything.".F( i.Key, prereq ) ); + foreach (var prereq in bi.Prerequisites) + if (!providedPrereqs.Contains(prereq.Replace("!", ""))) + emitError("Buildable actor {0} has prereq {1} not provided by anything.".F(i.Key, prereq)); } } } From b5a9a480ff27e91e481175501577990f17efd190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Mon, 19 Aug 2013 21:04:20 +0200 Subject: [PATCH 2/4] fix unbuildable Atreides Sonic Tank --- mods/d2k/rules/atreides.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/d2k/rules/atreides.yaml b/mods/d2k/rules/atreides.yaml index 541f1eb34a..4a608d3fab 100644 --- a/mods/d2k/rules/atreides.yaml +++ b/mods/d2k/rules/atreides.yaml @@ -154,7 +154,7 @@ SONICTANK: Buildable: Queue: Armor BuildPaletteOrder: 100 - Prerequisites: heavya,research + Prerequisites: heavya, researcha Owner: atreides Hotkey: o Valued: From de9321a17e87113783380453950f5c4ef5a99b97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Mon, 19 Aug 2013 21:04:30 +0200 Subject: [PATCH 3/4] fix unbuildable Medic --- mods/d2k/rules/infantry.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/d2k/rules/infantry.yaml b/mods/d2k/rules/infantry.yaml index 3d357dd673..088b27f20b 100644 --- a/mods/d2k/rules/infantry.yaml +++ b/mods/d2k/rules/infantry.yaml @@ -83,8 +83,8 @@ MEDIC: Buildable: Queue: Infantry BuildPaletteOrder: 60 - Owner: atreides,ordos - Prerequisites: research + Owner: atreides, ordos + Prerequisites: Research Hotkey: m Valued: Cost: 500 From 4b629eced48e17517af7b55713de752670835b8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Mon, 19 Aug 2013 21:04:54 +0200 Subject: [PATCH 4/4] adjust Deviator prerequisites still disabled --- mods/d2k/rules/ordos.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/d2k/rules/ordos.yaml b/mods/d2k/rules/ordos.yaml index 8a2d03ab39..1f4ea5ebc7 100644 --- a/mods/d2k/rules/ordos.yaml +++ b/mods/d2k/rules/ordos.yaml @@ -231,7 +231,7 @@ DEVIATORTANK: Buildable: Queue: Armor BuildPaletteOrder: 50 - Prerequisites: heavyo,research + Prerequisites: heavyo, researcho # Owner: ordos Hotkey: d Mobile: