removed ProjectileInfo.Rotates, since it's redundant now that we have facings= in sequences

This commit is contained in:
Chris Forbes
2010-03-17 18:39:05 +13:00
parent 64ac7464a5
commit c2d019210d
5 changed files with 2 additions and 26 deletions

View File

@@ -66,11 +66,7 @@ namespace OpenRA.Effects
if (Projectile.Image != null && Projectile.Image != "none") if (Projectile.Image != null && Projectile.Image != "none")
{ {
if (Projectile.Rotates) anim = new Animation(Projectile.Image, () => Traits.Util.GetFacing((dest - src).ToFloat2(), 0));
anim = new Animation(Projectile.Image, () => Traits.Util.GetFacing((dest - src).ToFloat2(), 0));
else
anim = new Animation(Projectile.Image);
anim.PlayRepeating("idle"); anim.PlayRepeating("idle");
} }
} }

View File

@@ -53,11 +53,7 @@ namespace OpenRA.Effects
if (Projectile.Image != null && Projectile.Image != "none") if (Projectile.Image != null && Projectile.Image != "none")
{ {
if (Projectile.Rotates) anim = new Animation(Projectile.Image, () => Facing);
anim = new Animation(Projectile.Image, () => Facing);
else
anim = new Animation(Projectile.Image);
anim.PlayRepeating("idle"); anim.PlayRepeating("idle");
} }
} }

View File

@@ -34,7 +34,6 @@ namespace OpenRA.GameRules
public readonly bool Parachuted = false; public readonly bool Parachuted = false;
public readonly bool Proximity = false; public readonly bool Proximity = false;
public readonly int ROT = 0; public readonly int ROT = 0;
public readonly bool Rotates = false;
public readonly bool Shadow = true; public readonly bool Shadow = true;
public readonly bool UnderWater = false; public readonly bool UnderWater = false;
public readonly int RangeLimit = 0; public readonly int RangeLimit = 0;

View File

@@ -320,7 +320,6 @@ Proximity=yes
;Ranged=yes ;Ranged=yes
Inaccurate=yes Inaccurate=yes
Image=MISSILE Image=MISSILE
Rotates=yes
; small homing missile (targets vehicles best) ; small homing missile (targets vehicles best)
[HeatSeeker] [HeatSeeker]
@@ -334,7 +333,6 @@ Inaccurate=yes
AA=yes AA=yes
Image=DRAGON Image=DRAGON
ROT=5 ROT=5
Rotates=yes
Trail=smokey Trail=smokey
; anti aircraft missile ; anti aircraft missile
@@ -343,12 +341,9 @@ Arm=3
High=yes High=yes
Shadow=no Shadow=no
Proximity=yes Proximity=yes
;Animates=yes
;Ranged=yes
AA=yes AA=yes
Image=MISSILE Image=MISSILE
ROT=20 ROT=20
Rotates=yes
; lobbed tumbling grenade ; lobbed tumbling grenade
[Lobbed] [Lobbed]
@@ -356,16 +351,13 @@ High=yes
Arcing=yes Arcing=yes
Inaccurate=yes Inaccurate=yes
Image=BOMB Image=BOMB
;Frames=8
; dropped from plane tumbling object ; dropped from plane tumbling object
[Bomblet] [Bomblet]
Arm=24 Arm=24
RangeLimit=24 RangeLimit=24
High=yes High=yes
;Dropping=yes
Image=BOMBLET Image=BOMBLET
;Frames=7
; arcing ballistic projectile ; arcing ballistic projectile
[BallisticP] [BallisticP]

View File

@@ -469,7 +469,6 @@ Warhead=Nuke
; Parachuted = Equipped with a parachute for dropping from plane (def=no)? ; Parachuted = Equipped with a parachute for dropping from plane (def=no)?
; Proximity = Does it blow up when near its target (def=no)? ; Proximity = Does it blow up when near its target (def=no)?
; ROT = Rate Of Turn [non zero implies homing] (def=0) ; ROT = Rate Of Turn [non zero implies homing] (def=0)
; Rotates = Does the projectile have rotation specific imagery (def=no)?
; Shadow = If High, does this bullet need to have a shadow drawn? (def = yes) ; Shadow = If High, does this bullet need to have a shadow drawn? (def = yes)
; UnderWater = Does the projectile travel under water? ; UnderWater = Does the projectile travel under water?
; Trail = image to use for smoke puffs etc (def=null) ; Trail = image to use for smoke puffs etc (def=null)
@@ -481,7 +480,6 @@ Warhead=Nuke
; special case for dog ; special case for dog
[LeapDog] [LeapDog]
Image=DOGBULLT Image=DOGBULLT
Rotates=yes
Proximity=yes Proximity=yes
ROT=20 ROT=20
@@ -498,7 +496,6 @@ AG=false
[Torpedo] [Torpedo]
UnderWater=yes UnderWater=yes
Image=MISSILE Image=MISSILE
Rotates=yes
ASW=yes ASW=yes
; Free Rocket Over Ground ; Free Rocket Over Ground
@@ -510,7 +507,6 @@ Proximity=yes
Trail=smokey Trail=smokey
Inaccurate=yes Inaccurate=yes
Image=V2 Image=V2
Rotates=yes
; small homing missile (targets vehicles best) ; small homing missile (targets vehicles best)
[HeatSeeker] [HeatSeeker]
@@ -523,7 +519,6 @@ Inaccurate=yes
AA=yes AA=yes
Image=DRAGON Image=DRAGON
ROT=5 ROT=5
Rotates=yes
RangeLimit=20 RangeLimit=20
; small missile with deadly accuracy ; small missile with deadly accuracy
@@ -536,7 +531,6 @@ Trail=smokey
AA=yes AA=yes
Image=DRAGON Image=DRAGON
ROT=20 ROT=20
Rotates=yes
RangeLimit=20 RangeLimit=20
; anti aircraft missile ; anti aircraft missile
@@ -550,7 +544,6 @@ AA=yes
AG=no AG=no
Image=MISSILE Image=MISSILE
ROT=20 ROT=20
Rotates=yes
RangeLimit=30 RangeLimit=30
; lobbed tumbling grenade ; lobbed tumbling grenade