From 6b44d232e7120f8b47d45b53f29339b851a0480e Mon Sep 17 00:00:00 2001 From: ScottNZ Date: Fri, 14 Jun 2013 20:20:33 +1200 Subject: [PATCH 1/9] Add Nukem's maps to the csproj --- OpenRA.Mods.RA/OpenRA.Mods.RA.csproj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj index 3a28ce89ce..85c4cfdaa6 100644 --- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj +++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj @@ -251,6 +251,8 @@ + + @@ -499,4 +501,4 @@ cd "$(SolutionDir)thirdparty/" copy "FuzzyLogicLibrary.dll" "$(SolutionDir)" cd "$(SolutionDir)" - + \ No newline at end of file From c2e450986f22e59af7e1bdd2e8ae393834172dee Mon Sep 17 00:00:00 2001 From: ScottNZ Date: Fri, 14 Jun 2013 20:20:55 +1200 Subject: [PATCH 2/9] Add license notice to FortScript.cs --- OpenRA.Mods.RA/Missions/FortScript.cs | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/OpenRA.Mods.RA/Missions/FortScript.cs b/OpenRA.Mods.RA/Missions/FortScript.cs index ae34207f98..0d11f0d792 100644 --- a/OpenRA.Mods.RA/Missions/FortScript.cs +++ b/OpenRA.Mods.RA/Missions/FortScript.cs @@ -1,17 +1,22 @@ -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 { From 1593c94d9034a0645e07f6e6b7037ba6c6086f8c Mon Sep 17 00:00:00 2001 From: ScottNZ Date: Fri, 14 Jun 2013 20:33:26 +1200 Subject: [PATCH 3/9] Add some debugging information to LoadYamlRules --- OpenRA.Game/GameRules/Rules.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenRA.Game/GameRules/Rules.cs b/OpenRA.Game/GameRules/Rules.cs index 1215311c6e..76ea3d9516 100755 --- a/OpenRA.Game/GameRules/Rules.cs +++ b/OpenRA.Game/GameRules/Rules.cs @@ -46,9 +46,9 @@ namespace OpenRA static Dictionary LoadYamlRules(string[] files, List dict, Func, 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> InstalledMusic { get { return Music.Where( m => m.Value.Exists ); } } From 5d374385618bb7165cb21a87f3a9a99b45664502 Mon Sep 17 00:00:00 2001 From: ScottNZ Date: Fri, 14 Jun 2013 20:33:33 +1200 Subject: [PATCH 4/9] Unbreak Fort Lonestar --- mods/ra/maps/Fort-Lonestar/map.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ra/maps/Fort-Lonestar/map.yaml b/mods/ra/maps/Fort-Lonestar/map.yaml index 2db891079e..069ce1fd4a 100644 --- a/mods/ra/maps/Fort-Lonestar/map.yaml +++ b/mods/ra/maps/Fort-Lonestar/map.yaml @@ -993,7 +993,7 @@ Rules: HP: 250 Armor: Type: Concrete - BADR.bomber: + BADR.Bomber: CarpetBomb: Range: 3 Weapon: ParaBomb From 06b797fd14d25112afcf63ba153bffd439568816 Mon Sep 17 00:00:00 2001 From: ScottNZ Date: Fri, 14 Jun 2013 20:40:40 +1200 Subject: [PATCH 5/9] Rename FortScript.cs to match the name of the map it's for --- .../Missions/{FortScript.cs => FortLonestarScript.cs} | 4 ++-- OpenRA.Mods.RA/OpenRA.Mods.RA.csproj | 2 +- mods/ra/maps/Fort-Lonestar/map.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename OpenRA.Mods.RA/Missions/{FortScript.cs => FortLonestarScript.cs} (99%) diff --git a/OpenRA.Mods.RA/Missions/FortScript.cs b/OpenRA.Mods.RA/Missions/FortLonestarScript.cs similarity index 99% rename from OpenRA.Mods.RA/Missions/FortScript.cs rename to OpenRA.Mods.RA/Missions/FortLonestarScript.cs index 0d11f0d792..9e61f389fc 100644 --- a/OpenRA.Mods.RA/Missions/FortScript.cs +++ b/OpenRA.Mods.RA/Missions/FortLonestarScript.cs @@ -20,9 +20,9 @@ using OpenRA.Widgets; namespace OpenRA.Mods.RA.Missions { - class FortScriptInfo : TraitInfo, Requires { } + class FortLonestarScriptInfo : TraitInfo, Requires { } - class FortScript : IWorldLoaded, ITick + class FortLonestarScript : IWorldLoaded, ITick { Player multi0; Player soviets; diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj index 85c4cfdaa6..c78ce1584d 100644 --- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj +++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj @@ -251,7 +251,7 @@ - + diff --git a/mods/ra/maps/Fort-Lonestar/map.yaml b/mods/ra/maps/Fort-Lonestar/map.yaml index 069ce1fd4a..fb33eba8c3 100644 --- a/mods/ra/maps/Fort-Lonestar/map.yaml +++ b/mods/ra/maps/Fort-Lonestar/map.yaml @@ -477,7 +477,7 @@ Rules: SpawnInterval: 100 -SpawnMPUnits: -MPStartLocations: - FortScript: + FortLonestarScript: CRATE: -LevelUpCrateAction: -GiveMcvCrateAction: From bad3bd5fbb76c08a258d5e69413d0d9bd77d6f7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Fri, 14 Jun 2013 12:04:28 +0200 Subject: [PATCH 6/9] added the parabox animation when parabomb cates are collected --- OpenRA.Mods.RA/Crates/SupportPowerCrateAction.cs | 4 +++- mods/ra/rules/system.yaml | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenRA.Mods.RA/Crates/SupportPowerCrateAction.cs b/OpenRA.Mods.RA/Crates/SupportPowerCrateAction.cs index 5d09aec7ad..078f2c4331 100644 --- a/OpenRA.Mods.RA/Crates/SupportPowerCrateAction.cs +++ b/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) })); } } diff --git a/mods/ra/rules/system.yaml b/mods/ra/rules/system.yaml index 34f027f938..05ac3233c5 100644 --- a/mods/ra/rules/system.yaml +++ b/mods/ra/rules/system.yaml @@ -729,6 +729,7 @@ CRATE: SupportPowerCrateAction@parabombs: SelectionShares: 5 Proxy: powerproxy.parabombs + Effect: parabombs GiveMcvCrateAction: SelectionShares: 2 NoBaseSelectionShares: 9001 From 2b8319090e26a7c03a7b0521e35b927b64a5f230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Fri, 14 Jun 2013 12:10:52 +0200 Subject: [PATCH 7/9] fixed Mig bombers crashing to earth when entering Fort Lonestar --- mods/ra/maps/Fort-Lonestar/map.yaml | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/mods/ra/maps/Fort-Lonestar/map.yaml b/mods/ra/maps/Fort-Lonestar/map.yaml index fb33eba8c3..5123615e52 100644 --- a/mods/ra/maps/Fort-Lonestar/map.yaml +++ b/mods/ra/maps/Fort-Lonestar/map.yaml @@ -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: From ebe0b0323e9026f60f759bc470e3efc597d0cdad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Fri, 14 Jun 2013 12:12:18 +0200 Subject: [PATCH 8/9] make the snipers fire at targets in Fort Lonestar --- mods/ra/maps/Fort-Lonestar/map.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ra/maps/Fort-Lonestar/map.yaml b/mods/ra/maps/Fort-Lonestar/map.yaml index 5123615e52..1f51c068b0 100644 --- a/mods/ra/maps/Fort-Lonestar/map.yaml +++ b/mods/ra/maps/Fort-Lonestar/map.yaml @@ -813,7 +813,7 @@ Rules: RevealsShroud: Range: 6 AutoTarget: - InitialStance: HoldFire + InitialStance: Defend Armament: Weapon: Sniper SPY: From b2201a04638a8496e1183b3b7009a7752bd2d081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Fri, 14 Jun 2013 12:47:52 +0200 Subject: [PATCH 9/9] fixed conflicting sniper hotkey and too much damage vs walls closes #3381 --- mods/ra/rules/infantry.yaml | 2 +- mods/ra/weapons.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index 841e38b044..a8fcf6822e 100644 --- a/mods/ra/rules/infantry.yaml +++ b/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: diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml index bb3226466f..d2c6a945f1 100644 --- a/mods/ra/weapons.yaml +++ b/mods/ra/weapons.yaml @@ -1232,6 +1232,7 @@ Sniper: Wood: 5% Light: 5% Heavy: 5% + Concrete: 5% InfDeath: 2 ChronoTusk: