HasSight -> RevealsShroud and used everywhere
This commit is contained in:
@@ -82,7 +82,7 @@
|
|||||||
<Compile Include="Orders\GenericSelectTarget.cs" />
|
<Compile Include="Orders\GenericSelectTarget.cs" />
|
||||||
<Compile Include="Traits\AI\EmitInfantryOnSell.cs" />
|
<Compile Include="Traits\AI\EmitInfantryOnSell.cs" />
|
||||||
<Compile Include="Traits\AI\ReturnOnIdle.cs" />
|
<Compile Include="Traits\AI\ReturnOnIdle.cs" />
|
||||||
<Compile Include="Traits\HasSight.cs" />
|
<Compile Include="Traits\RevealsShroud.cs" />
|
||||||
<Compile Include="Traits\Player\VictoryConditions.cs" />
|
<Compile Include="Traits\Player\VictoryConditions.cs" />
|
||||||
<Compile Include="Traits\Modifiers\HiddenUnderFog.cs" />
|
<Compile Include="Traits\Modifiers\HiddenUnderFog.cs" />
|
||||||
<Compile Include="Traits\Render\RenderFlare.cs" />
|
<Compile Include="Traits\Render\RenderFlare.cs" />
|
||||||
|
|||||||
@@ -53,7 +53,6 @@ namespace OpenRA.Traits
|
|||||||
{
|
{
|
||||||
self.World.WorldActor.traits.Get<UnitInfluence>().Remove(self, this);
|
self.World.WorldActor.traits.Get<UnitInfluence>().Remove(self, this);
|
||||||
self.Location = value;
|
self.Location = value;
|
||||||
self.World.WorldActor.traits.Get<Shroud>().UpdateActor(self);
|
|
||||||
}
|
}
|
||||||
self.World.WorldActor.traits.Get<UnitInfluence>().Add(self, this);
|
self.World.WorldActor.traits.Get<UnitInfluence>().Add(self, this);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,16 +20,19 @@
|
|||||||
|
|
||||||
namespace OpenRA.Traits
|
namespace OpenRA.Traits
|
||||||
{
|
{
|
||||||
class HasSightInfo : TraitInfo<HasSight> { }
|
class RevealsShroudInfo : TraitInfo<RevealsShroud> { }
|
||||||
|
|
||||||
// for random non-mobile movers
|
class RevealsShroud : ITick
|
||||||
|
|
||||||
class HasSight : ITick
|
|
||||||
{
|
{
|
||||||
|
int2 previousLocation;
|
||||||
|
|
||||||
public void Tick(Actor self)
|
public void Tick(Actor self)
|
||||||
{
|
{
|
||||||
if (!self.IsIdle)
|
if (!self.IsIdle && previousLocation != self.Location)
|
||||||
|
{
|
||||||
|
previousLocation = self.Location;
|
||||||
self.World.WorldActor.traits.Get<Shroud>().UpdateActor(self);
|
self.World.WorldActor.traits.Get<Shroud>().UpdateActor(self);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -87,6 +87,8 @@ namespace OpenRA.Traits
|
|||||||
vis = GetVisOrigins(a).ToArray()
|
vis = GetVisOrigins(a).ToArray()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if (v.range == 0) return; // don't bother for things that can't see
|
||||||
|
|
||||||
foreach (var p in v.vis)
|
foreach (var p in v.vis)
|
||||||
{
|
{
|
||||||
foreach (var q in FindVisibleTiles(a.World, p, v.range))
|
foreach (var q in FindVisibleTiles(a.World, p, v.range))
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
Passenger:
|
Passenger:
|
||||||
IronCurtainable:
|
IronCurtainable:
|
||||||
HiddenUnderFog:
|
HiddenUnderFog:
|
||||||
|
RevealsShroud:
|
||||||
|
|
||||||
^Infantry:
|
^Infantry:
|
||||||
Category: Infantry
|
Category: Infantry
|
||||||
@@ -26,6 +27,7 @@
|
|||||||
Passenger:
|
Passenger:
|
||||||
HiddenUnderFog:
|
HiddenUnderFog:
|
||||||
PoisonedByTiberium:
|
PoisonedByTiberium:
|
||||||
|
RevealsShroud:
|
||||||
|
|
||||||
^Ship:
|
^Ship:
|
||||||
Category: Ship
|
Category: Ship
|
||||||
@@ -34,12 +36,14 @@
|
|||||||
MovementType: Float
|
MovementType: Float
|
||||||
Selectable:
|
Selectable:
|
||||||
HiddenUnderFog:
|
HiddenUnderFog:
|
||||||
|
RevealsShroud:
|
||||||
|
|
||||||
^Plane:
|
^Plane:
|
||||||
Category: Plane
|
Category: Plane
|
||||||
Unit:
|
Unit:
|
||||||
Selectable:
|
Selectable:
|
||||||
HiddenUnderFog:
|
HiddenUnderFog:
|
||||||
|
RevealsShroud:
|
||||||
|
|
||||||
^Building:
|
^Building:
|
||||||
Category: Building
|
Category: Building
|
||||||
|
|||||||
@@ -379,7 +379,7 @@ TRAN:
|
|||||||
Armor: light
|
Armor: light
|
||||||
InitialFacing: 20
|
InitialFacing: 20
|
||||||
ROT: 5
|
ROT: 5
|
||||||
Sight: 0
|
Sight: 4
|
||||||
Speed: 15
|
Speed: 15
|
||||||
Helicopter:
|
Helicopter:
|
||||||
RenderUnitRotor:
|
RenderUnitRotor:
|
||||||
@@ -407,7 +407,7 @@ HELI:
|
|||||||
Crewed: yes
|
Crewed: yes
|
||||||
InitialFacing: 20
|
InitialFacing: 20
|
||||||
ROT: 4
|
ROT: 4
|
||||||
Sight: 0
|
Sight: 6
|
||||||
Speed: 20
|
Speed: 20
|
||||||
AttackHeli:
|
AttackHeli:
|
||||||
PrimaryWeapon: HighV
|
PrimaryWeapon: HighV
|
||||||
@@ -438,7 +438,7 @@ ORCA:
|
|||||||
Crewed: yes
|
Crewed: yes
|
||||||
InitialFacing: 20
|
InitialFacing: 20
|
||||||
ROT: 4
|
ROT: 4
|
||||||
Sight: 0
|
Sight: 6
|
||||||
Speed: 20
|
Speed: 20
|
||||||
AttackHeli:
|
AttackHeli:
|
||||||
PrimaryWeapon: Rockets
|
PrimaryWeapon: Rockets
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
Passenger:
|
Passenger:
|
||||||
IronCurtainable:
|
IronCurtainable:
|
||||||
HiddenUnderFog:
|
HiddenUnderFog:
|
||||||
|
RevealsShroud:
|
||||||
|
|
||||||
^Infantry:
|
^Infantry:
|
||||||
Category: Infantry
|
Category: Infantry
|
||||||
@@ -25,6 +26,7 @@
|
|||||||
AutoTarget:
|
AutoTarget:
|
||||||
Passenger:
|
Passenger:
|
||||||
HiddenUnderFog:
|
HiddenUnderFog:
|
||||||
|
RevealsShroud:
|
||||||
|
|
||||||
^Ship:
|
^Ship:
|
||||||
Category: Ship
|
Category: Ship
|
||||||
@@ -33,6 +35,7 @@
|
|||||||
MovementType: Float
|
MovementType: Float
|
||||||
Selectable:
|
Selectable:
|
||||||
HiddenUnderFog:
|
HiddenUnderFog:
|
||||||
|
RevealsShroud:
|
||||||
|
|
||||||
^Plane:
|
^Plane:
|
||||||
Category: Plane
|
Category: Plane
|
||||||
@@ -40,6 +43,7 @@
|
|||||||
TargetType: Air
|
TargetType: Air
|
||||||
Selectable:
|
Selectable:
|
||||||
HiddenUnderFog:
|
HiddenUnderFog:
|
||||||
|
RevealsShroud:
|
||||||
|
|
||||||
^Building:
|
^Building:
|
||||||
Category: Building
|
Category: Building
|
||||||
|
|||||||
@@ -560,7 +560,6 @@ MIG:
|
|||||||
Ammo: 3
|
Ammo: 3
|
||||||
IronCurtainable:
|
IronCurtainable:
|
||||||
ReturnOnIdle:
|
ReturnOnIdle:
|
||||||
HasSight:
|
|
||||||
|
|
||||||
YAK:
|
YAK:
|
||||||
Inherits: ^Plane
|
Inherits: ^Plane
|
||||||
@@ -590,7 +589,6 @@ YAK:
|
|||||||
Ammo: 15
|
Ammo: 15
|
||||||
IronCurtainable:
|
IronCurtainable:
|
||||||
ReturnOnIdle:
|
ReturnOnIdle:
|
||||||
HasSight:
|
|
||||||
|
|
||||||
TRAN:
|
TRAN:
|
||||||
Inherits: ^Plane
|
Inherits: ^Plane
|
||||||
@@ -618,7 +616,6 @@ TRAN:
|
|||||||
PassengerTypes: Foot
|
PassengerTypes: Foot
|
||||||
Passengers: 5
|
Passengers: 5
|
||||||
IronCurtainable:
|
IronCurtainable:
|
||||||
HasSight:
|
|
||||||
|
|
||||||
HELI:
|
HELI:
|
||||||
Inherits: ^Plane
|
Inherits: ^Plane
|
||||||
@@ -650,7 +647,6 @@ HELI:
|
|||||||
LimitedAmmo:
|
LimitedAmmo:
|
||||||
Ammo: 6
|
Ammo: 6
|
||||||
IronCurtainable:
|
IronCurtainable:
|
||||||
HasSight:
|
|
||||||
|
|
||||||
HIND:
|
HIND:
|
||||||
Inherits: ^Plane
|
Inherits: ^Plane
|
||||||
@@ -680,7 +676,6 @@ HIND:
|
|||||||
LimitedAmmo:
|
LimitedAmmo:
|
||||||
Ammo: 12
|
Ammo: 12
|
||||||
IronCurtainable:
|
IronCurtainable:
|
||||||
HasSight:
|
|
||||||
|
|
||||||
U2:
|
U2:
|
||||||
Inherits: ^Plane
|
Inherits: ^Plane
|
||||||
|
|||||||
Reference in New Issue
Block a user