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

don't autotarget trees.

Browse Source
This commit is contained in:
Chris Forbes
2009-12-16 11:57:54 +13:00
parent 5112cd2aa1
commit 4a01a911ff
2 changed files with 60 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRa.Game/Traits/AutoTarget.cs
View File

@@ -23,7 +23,7 @@ namespace OpenRa.Game.Traits
{
var inRange = Game.FindUnitsInCircle(self.CenterLocation, Game.CellSize * range);
return inRange.Where(a => a.Owner != self.Owner) /* todo: one day deal with friendly players */
return inRange.Where(a => a.Owner != null && a.Owner != self.Owner) /* todo: one day deal with friendly players */
.OrderBy(a => (a.Location - self.Location).LengthSquared)
.FirstOrDefault();
}

115
units.ini
View File

@@ -186,6 +186,65 @@ MSLO
; FENC
[PBOX]
Description=Pillbox
Traits=Building, Turreted, RenderBuilding, AttackTurreted, AutoTarget
Dimensions=1,1
Footprint=x
SelectionPriority=3
[HBOX]
Description=Camo Pillbox
Traits=Building, Turreted, RenderBuilding, AttackTurreted, AutoTarget
Dimensions=1,1
Footprint=x
SelectionPriority=3
[TSLA]
Description=Tesla Coil
Traits=Building, RenderBuilding
Dimensions=1,2
Footprint=_ x
SelectionPriority=3
[GUN]
Description=Turret
Traits=Building, Turreted, RenderBuildingTurreted, AttackTurreted, AutoTarget
Dimensions=1,1
Footprint=x
SelectionPriority=3
InitialFacing=50
[AGUN]
Description=AA Gun
Traits=Building, Turreted, RenderBuildingTurreted
Dimensions=1,2
Footprint=_ x
SelectionPriority=3
InitialFacing=224
[FTUR]
Description=Flame Turret
Traits=Building, RenderBuilding
Dimensions=1,1
Footprint=x
SelectionPriority=3
[GAP]
Description=Gap Generator
Traits=Building, RenderBuilding
Dimensions=1,2
Footprint=_ x
SelectionPriority=3
[SAM]
Description=SAM Site
Traits=Building, Turreted, RenderBuildingTurreted
Dimensions=2,1
Footprint=xx
SelectionPriority=3
[MSLO]
Description=Missile Silo
Traits=Building, RenderBuilding
Dimensions=2,1
Footprint=xx
SelectionPriority=3
[BuildingTypes]
ATEK
WEAP
@@ -259,44 +318,6 @@ Dimensions=3,3
Footprint=xxx xxx xxx
Produces=Ship
SelectionPriority=3
[PBOX]
Description=Pillbox
Traits=Building, RenderBuilding
Dimensions=1,1
Footprint=x
SelectionPriority=3
[HBOX]
Description=Camo Pillbox
Traits=Building, RenderBuilding
Dimensions=1,1
Footprint=x
SelectionPriority=3
[TSLA]
Description=Tesla Coil
Traits=Building, RenderBuilding
Dimensions=1,2
Footprint=_ x
SelectionPriority=3
[GUN]
Description=Turret
Traits=Building, Turreted, RenderBuildingTurreted, AttackTurreted, AutoTarget
Dimensions=1,1
Footprint=x
SelectionPriority=3
InitialFacing=50
[AGUN]
Description=AA Gun
Traits=Building, Turreted, RenderBuildingTurreted
Dimensions=1,2
Footprint=_ x
SelectionPriority=3
InitialFacing=224
[FTUR]
Description=Flame Turret
Traits=Building, RenderBuilding
Dimensions=1,1
Footprint=x
SelectionPriority=3
[FACT]
Description=Construction Yard
Traits=Building, RenderBuilding
@@ -330,24 +351,6 @@ Traits=Building, RenderBuilding
Dimensions=2,2
Footprint=xx xx
SelectionPriority=3
[GAP]
Description=Gap Generator
Traits=Building, RenderBuilding
Dimensions=1,2
Footprint=_ x
SelectionPriority=3
[SAM]
Description=SAM Site
Traits=Building, Turreted, RenderBuildingTurreted
Dimensions=2,1
Footprint=xx
SelectionPriority=3
[MSLO]
Description=Missile Silo
Traits=Building, RenderBuilding
Dimensions=2,1
Footprint=xx
SelectionPriority=3
[AFLD]
Description=Airstrip
Traits=Building, RenderBuilding, Production