Merge pull request #3405 from Mailaender/fort-bugstar

Fixed the worsed problems in Fort Lonestar

OpenRA.Game/GameRules/Rules.cs

@@ -46,9 +46,9 @@ namespace OpenRA
 
 		static Dictionary<string, T> LoadYamlRules<T>(string[] files, List<MiniYamlNode> dict, Func<MiniYamlNode, Dictionary<string, MiniYaml>, T> f)
 		{
-			var y = files.Select(a => MiniYaml.FromFile(a)).Aggregate(dict, MiniYaml.MergeLiberal);
-			var yy = y.ToDictionary( x => x.Key, x => x.Value );
-			return y.ToDictionary(kv => kv.Key.ToLowerInvariant(), kv => f(kv, yy));
+			var y = files.Select(MiniYaml.FromFile).Aggregate(dict, MiniYaml.MergeLiberal);
+			var yy = y.ToDictionary(x => x.Key, x => x.Value);
+			return y.ToDictionaryWithConflictLog(kv => kv.Key.ToLowerInvariant(), kv => f(kv, yy), "LoadYamlRules", null, null);
 		}
 
 		public static IEnumerable<KeyValuePair<string,MusicInfo>> InstalledMusic { get { return Music.Where( m => m.Value.Exists ); } }

OpenRA.Mods.RA/Crates/SupportPowerCrateAction.cs

@@ -31,9 +31,11 @@ namespace OpenRA.Mods.RA.Crates
 		// We want neither of these properties for crate power proxies.
 		public override void Activate(Actor collector)
 		{
+			base.Activate(collector);
+
 			collector.World.AddFrameEndTask(w => w.CreateActor(Info.Proxy, new TypeDictionary
 			{
-				new OwnerInit( collector.Owner )
+				new OwnerInit(collector.Owner)
 			}));
 		}
 	}

OpenRA.Mods.RA/Missions/FortLonestarScript.cs

@@ -1,23 +1,28 @@
-using System.Collections.Generic;
+#region Copyright & License Information
+/*
+ * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
 using System.Drawing;
 using System.Linq;
-using System;
 using OpenRA.FileFormats;
 using OpenRA.Mods.RA.Activities;
-using OpenRA.Mods.RA.Air;
+using OpenRA.Mods.RA.Buildings;
 using OpenRA.Mods.RA.Move;
-using OpenRA.Network;
-using OpenRA.Scripting;
 using OpenRA.Traits;
 using OpenRA.Widgets;
-using OpenRA.Mods.RA.Buildings;
-using OpenRA.Mods.RA.Effects;
 
 namespace OpenRA.Mods.RA.Missions
 {
-    class FortScriptInfo : TraitInfo<FortScript>, Requires<SpawnMapActorsInfo> { }
+    class FortLonestarScriptInfo : TraitInfo<FortLonestarScript>, Requires<SpawnMapActorsInfo> { }
 
-    class FortScript : IWorldLoaded, ITick
+    class FortLonestarScript : IWorldLoaded, ITick
     {
         Player multi0;
         Player soviets;

OpenRA.Mods.RA/OpenRA.Mods.RA.csproj

@@ -251,6 +251,8 @@
     <Compile Include="Lint\CheckTraitPrerequisites.cs" />
     <Compile Include="Lint\LintBuildablePrerequisites.cs" />
     <Compile Include="Missions\DesertShellmapScript.cs" />
+    <Compile Include="Missions\FortLonestarScript.cs" />
+    <Compile Include="Missions\Survival02Script.cs" />
     <Compile Include="MPStartLocations.cs" />
     <Compile Include="Mine.cs" />
     <Compile Include="Minelayer.cs" />
@@ -499,4 +501,4 @@ cd "$(SolutionDir)thirdparty/"
 copy "FuzzyLogicLibrary.dll" "$(SolutionDir)"
 cd "$(SolutionDir)"</PostBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>

mods/ra/maps/Fort-Lonestar/map.yaml

@@ -477,7 +477,7 @@ Rules:
 			SpawnInterval: 100
 		-SpawnMPUnits:
 		-MPStartLocations:
-		FortScript:
+		FortLonestarScript:
 	CRATE:
 		-LevelUpCrateAction:
 		-GiveMcvCrateAction:
@@ -813,7 +813,7 @@ Rules:
 		RevealsShroud:
 			Range: 6
 		AutoTarget:
-			InitialStance: HoldFire
+			InitialStance: Defend
 		Armament:
 			Weapon: Sniper
 	SPY:
@@ -993,7 +993,7 @@ Rules:
 			HP: 250
 		Armor:
 			Type: Concrete
-	BADR.bomber:
+	BADR.Bomber:
 		CarpetBomb:
 			Range: 3
 			Weapon: ParaBomb
@@ -1014,13 +1014,25 @@ Rules:
 		-Selectable:
 		-GainsExperience:
 		Tooltip:
-			Name: Badger
-		FallsToEarth:
-			Spins: no
-			Moves: yes
-			Explosion: UnitExplode
+			Name: Mig Bomber
+		LeavesHusk:
+			HuskActor: BADR.Husk
 		-EjectOnDeath:
 		-GpsDot:
+	BADR.Husk:
+		Inherits: ^PlaneHusk
+		Tooltip:
+			Name: Badger
+		RenderUnit:
+			Image: mig
+		WithShadow:
+		Plane:
+			ROT: 5
+			Speed: 16
+		SmokeTrailWhenDamaged:
+			Offset: -853,0,171
+			Interval: 2
+			MinDamage: Undamaged
 
 Sequences:
 

mods/ra/rules/infantry.yaml

@@ -454,7 +454,7 @@ SNIPER:
 		BuildPaletteOrder: 80
 		Owner: soviet
 		Prerequisites: dome
-		Hotkey: n
+		Hotkey: s
 	Selectable:
 		Bounds: 12,17,0,-6
 	Mobile:

mods/ra/rules/system.yaml

@@ -729,6 +729,7 @@ CRATE:
 	SupportPowerCrateAction@parabombs:
 		SelectionShares: 5
 		Proxy: powerproxy.parabombs
+		Effect: parabombs
 	GiveMcvCrateAction:
 		SelectionShares: 2
 		NoBaseSelectionShares: 9001

mods/ra/weapons.yaml

@@ -1223,6 +1223,7 @@ Sniper:
 			Wood: 5%
 			Light: 5%
 			Heavy: 5%
+			Concrete: 5%
 		InfDeath: 2
 
 ChronoTusk: