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

Merge pull request #3239 from chrisforbes/unhardcode-crate-drop

Browse Source 
Un-hardcode crate drop actor names
This commit is contained in:
Matthias Mailänder
2013-05-09 03:56:50 -07:00
parent abcc30f0b7 7ac87dfdf8
commit 0e624ad12f
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.RA/CrateDrop.cs
View File

@@ -32,6 +32,10 @@ namespace OpenRA.Mods.RA
public readonly int SpawnInterval = 180; public readonly int SpawnInterval = 180;
[Desc("Chance of generating a water crate instead of a land crate")] [Desc("Chance of generating a water crate instead of a land crate")]
public readonly float WaterChance = .2f; public readonly float WaterChance = .2f;
[ActorReference]
public readonly string CrateActor = "crate";
[ActorReference]
public readonly string DeliveryAircraft = "badr";
public object Create (ActorInitializer init) { return new CrateDrop(this); } public object Create (ActorInitializer init) { return new CrateDrop(this); }
} }
@@ -91,16 +95,16 @@ namespace OpenRA.Mods.RA
var p = pp.Value; // var p = pp.Value; //
self.World.AddFrameEndTask(w => self.World.AddFrameEndTask(w =>
{ {
var crate = w.CreateActor(false, "crate", new TypeDictionary { new OwnerInit(w.WorldActor.Owner) }); var crate = w.CreateActor(false, Info.CrateActor, new TypeDictionary { new OwnerInit(w.WorldActor.Owner) });
crates.Add(crate); crates.Add(crate);
var startPos = w.ChooseRandomEdgeCell(); var startPos = w.ChooseRandomEdgeCell();
var plane = w.CreateActor("badr", new TypeDictionary var plane = w.CreateActor(Info.DeliveryAircraft, new TypeDictionary
{ {
new LocationInit( startPos ), new LocationInit( startPos ),
new OwnerInit( w.WorldActor.Owner), new OwnerInit( w.WorldActor.Owner),
new FacingInit( Util.GetFacing(p - startPos, 0) ), new FacingInit( Util.GetFacing(p - startPos, 0) ),
new AltitudeInit( Rules.Info["badr"].Traits.Get<AircraftInfo>().CruiseAltitude ), new AltitudeInit( Rules.Info[Info.DeliveryAircraft].Traits.Get<AircraftInfo>().CruiseAltitude ),
}); });
plane.CancelActivity(); plane.CancelActivity();