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

Expose targetline colors to yaml.

Browse Source 
All targetlines can now be set to a custom color in yaml or set to be invisible.
All automated behaviours including scripted activities now have no visible target lines.
This commit is contained in:
tovl
2020-08-02 22:22:39 +02:00
committed by Paul Chote
parent ea3c7a3c34
commit 84eb3c54ef
41 changed files with 139 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Common/Scripting/Properties/CaptureProperties.cs
View File

@@ -35,7 +35,8 @@ namespace OpenRA.Mods.Common.Scripting
if (targetManager == null || !targetManager.CanBeTargetedBy(target, Self, captureManager))
throw new LuaException("Actor '{0}' cannot capture actor '{1}'!".F(Self, target));
Self.QueueActivity(new CaptureActor(Self, Target.FromActor(target)));
// NB: Scripted actions get no visible targetlines.
Self.QueueActivity(new CaptureActor(Self, Target.FromActor(target), null));
}
}
}

9
OpenRA.Mods.Common/Scripting/Properties/DeliveryProperties.cs
View File

@@ -33,7 +33,9 @@ namespace OpenRA.Mods.Common.Scripting
public void DeliverCash(Actor target)
{
var t = Target.FromActor(target);
Self.QueueActivity(new DonateCash(Self, t, info.Payload, info.PlayerExperience));
// NB: Scripted actions get no visible targetlines.
Self.QueueActivity(new DonateCash(Self, t, info.Payload, info.PlayerExperience, null));
}
}
@@ -62,9 +64,10 @@ namespace OpenRA.Mods.Common.Scripting
return;
var level = gainsExperience.Level;
var t = Target.FromActor(target);
Self.QueueActivity(new DonateExperience(Self, t, level, deliversExperience.PlayerExperience));
// NB: Scripted actions get no visible targetlines.
Self.QueueActivity(new DonateExperience(Self, t, level, deliversExperience.PlayerExperience, null));
}
}
}

3
OpenRA.Mods.Common/Scripting/Properties/DemolitionProperties.cs
View File

@@ -31,8 +31,9 @@ namespace OpenRA.Mods.Common.Scripting
[Desc("Demolish the target actor.")]
public void Demolish(Actor target)
{
// NB: Scripted actions get no visible targetlines.
Self.QueueActivity(new Demolish(Self, Target.FromActor(target), info.EnterBehaviour, info.DetonationDelay,
info.Flashes, info.FlashesDelay, info.FlashInterval, info.DamageTypes));
info.Flashes, info.FlashesDelay, info.FlashInterval, info.DamageTypes, null));
}
}
}

2
OpenRA.Mods.Common/Scripting/Properties/MobileProperties.cs
View File

@@ -63,7 +63,7 @@ namespace OpenRA.Mods.Common.Scripting
[Desc("Move to and enter the transport.")]
public void EnterTransport(Actor transport)
{
Self.QueueActivity(new RideTransport(Self, Target.FromActor(transport)));
Self.QueueActivity(new RideTransport(Self, Target.FromActor(transport), null));
}
[Desc("Whether the actor can move (false if immobilized).")]