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

Allow actors to target terrain without force-fire

Browse Source
This commit is contained in:
Oliver Brakmann
2022-06-30 19:17:37 +02:00
committed by Gustas
parent f1fba1ed14
commit 4cc9b1be2b
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
View File

@@ -55,6 +55,9 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Tolerance for attack angle. Range [0, 512], 512 covers 360 degrees.")]
public readonly WAngle FacingTolerance = new(512);
[Desc("When enabled, show the target cursor on terrain cells even without force-fire.")]
public readonly bool TargetTerrainWithoutForceFire = false;
public override void RulesetLoaded(Ruleset rules, ActorInfo ai)
{
base.RulesetLoaded(rules, ai);
@@ -361,7 +364,7 @@ namespace OpenRA.Mods.Common.Traits
{
// If force-fire is not used, and the target requires force-firing or the target is
// terrain or invalid, no armaments can be used
if (!forceAttack && (t.Type == TargetType.Terrain || t.Type == TargetType.Invalid || t.RequiresForceFire))
if (!forceAttack && ((t.Type == TargetType.Terrain && !Info.TargetTerrainWithoutForceFire) || t.Type == TargetType.Invalid || t.RequiresForceFire))
return Enumerable.Empty<Armament>();
// Get target's owner; in case of terrain or invalid target there will be no problems
@@ -477,8 +480,9 @@ namespace OpenRA.Mods.Common.Traits
IsQueued = modifiers.HasModifier(TargetModifiers.ForceQueue);
// Targeting the terrain is only possible with force-attack modifier
if (modifiers.HasModifier(TargetModifiers.ForceMove) || !modifiers.HasModifier(TargetModifiers.ForceAttack))
// Targeting the terrain is only possible with force-attack modifier or when TargetTerrainWithoutForceFire is set
if (modifiers.HasModifier(TargetModifiers.ForceMove) ||
!(ab.Info.TargetTerrainWithoutForceFire || modifiers.HasModifier(TargetModifiers.ForceAttack)))
return false;
var target = Target.FromCell(self.World, location);