epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "make WeaponInfo suck a bit less"

Browse Source 
This reverts commit 7b7b9d3319.
This commit is contained in:
Chris Forbes
2010-08-30 12:21:53 +12:00
parent a917086969
commit bce52e989f
1 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
OpenRA.Game/GameRules/WeaponInfo.cs
View File

@@ -9,7 +9,6 @@
#endregion #endregion
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using OpenRA.Effects; using OpenRA.Effects;
using OpenRA.FileFormats; using OpenRA.FileFormats;
using OpenRA.Traits; using OpenRA.Traits;
@@ -85,28 +84,35 @@ namespace OpenRA.GameRules
public IProjectileInfo Projectile; public IProjectileInfo Projectile;
public List<WarheadInfo> Warheads = new List<WarheadInfo>(); public List<WarheadInfo> Warheads = new List<WarheadInfo>();
static readonly string[] SimpleFields = { "Range", "Report", "ROF", "Burst", "Charges", "Underwater",
"ValidTargets", "BurstDelay" };
public WeaponInfo(string name, MiniYaml content) public WeaponInfo(string name, MiniYaml content)
{ {
FieldLoader.LoadFields( this, content.Nodes, SimpleFields );
foreach (var kv in content.Nodes) foreach (var kv in content.Nodes)
{ {
var key = kv.Key.Split('@')[0]; var key = kv.Key.Split('@')[0];
if (SimpleFields.Contains(key)) switch (key)
continue;
else if (key == "Warhead")
{ {
var warhead = new WarheadInfo(); case "Range": FieldLoader.LoadField(this, "Range", content.Nodes["Range"].Value); break;
FieldLoader.Load(warhead, kv.Value); case "ROF": FieldLoader.LoadField(this, "ROF", content.Nodes["ROF"].Value); break;
Warheads.Add(warhead); case "Report": FieldLoader.LoadField(this, "Report", content.Nodes["Report"].Value); break;
} case "Burst": FieldLoader.LoadField(this, "Burst", content.Nodes["Burst"].Value); break;
else case "Charges": FieldLoader.LoadField(this, "Charges", content.Nodes["Charges"].Value); break;
{ case "ValidTargets": FieldLoader.LoadField(this, "ValidTargets", content.Nodes["ValidTargets"].Value); break;
Projectile = Game.CreateObject<IProjectileInfo>(key + "Info"); case "Underwater": FieldLoader.LoadField(this, "Underwater", content.Nodes["Underwater"].Value); break;
FieldLoader.Load(Projectile, kv.Value); case "BurstDelay": FieldLoader.LoadField(this, "BurstDelay", content.Nodes["BurstDelay"].Value); break;
case "Warhead":
{
var warhead = new WarheadInfo();
FieldLoader.Load(warhead, kv.Value);
Warheads.Add(warhead);
} break;
// in this case, it's an implementation of IProjectileInfo
default:
{
Projectile = Game.CreateObject<IProjectileInfo>(key + "Info");
FieldLoader.Load(Projectile, kv.Value);
} break;
} }
} }
} }