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

heal sortof works... except it kills the patient.

Browse Source
This commit is contained in:
Chris Forbes
2009-12-28 10:59:00 +13:00
parent b4008af0ca
commit 8202f2cdc4
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,9 @@ namespace OpenRa.Game.Traits
{ {
var inRange = Game.FindUnitsInCircle(self.CenterLocation, Game.CellSize * range); var inRange = Game.FindUnitsInCircle(self.CenterLocation, Game.CellSize * range);
return inRange.Where(a => a.Owner != null && 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 */
.Where(a => Combat.HasAnyValidWeapons(self, a))
.OrderBy(a => (a.Location - self.Location).LengthSquared) .OrderBy(a => (a.Location - self.Location).LengthSquared)
.FirstOrDefault(); .FirstOrDefault();
} }
@@ -46,6 +48,9 @@ namespace OpenRa.Game.Traits
if (e.Attacker.Owner == self.Owner) if (e.Attacker.Owner == self.Owner)
return; // don't retaliate against own units force-firing on us. it's usually not what the player wanted. return; // don't retaliate against own units force-firing on us. it's usually not what the player wanted.
if (e.Damage < 0)
return; // don't retaliate against healers
var attack = self.traits.WithInterface<AttackBase>().First(); var attack = self.traits.WithInterface<AttackBase>().First();
if (attack.target != null) return; if (attack.target != null) return;

5
OpenRa.Game/Traits/RenderInfantry.cs
View File

@@ -50,7 +50,10 @@ namespace OpenRa.Game.Traits
var prefix = IsProne(self) ? "prone-shoot-" : "shoot-"; var prefix = IsProne(self) ? "prone-shoot-" : "shoot-";
anim.PlayThen(prefix + dir, () => inAttack = false); if (anim.HasSequence(prefix + dir))
anim.PlayThen(prefix + dir, () => inAttack = false);
else if (anim.HasSequence("heal"))
anim.PlayThen("heal", () => inAttack = false);
} }
public override void Tick(Actor self) public override void Tick(Actor self)

2
rules.ini
View File

@@ -2134,7 +2134,7 @@ Report=DOGG5P
[Heal] [Heal]
Damage=-50 Damage=-50
ROF=80 ROF=80
Range=1.83 Range=4 ;; 1.83
Projectile=Invisible Projectile=Invisible
Speed=100 Speed=100
Warhead=Organic Warhead=Organic

4
sequences.xml
View File

@@ -498,12 +498,12 @@
<sequence name="standup-5" start="124" length="2" /> <sequence name="standup-5" start="124" length="2" />
<sequence name="standup-6" start="126" length="2" /> <sequence name="standup-6" start="126" length="2" />
<sequence name="standup-7" start="128" length="2" /> <sequence name="standup-7" start="128" length="2" />
<sequence name="die1" start="196" length="5" /> <sequence name="die1" start="196" length="5" />
<sequence name="die2" start="201" length="8" /> <sequence name="die2" start="201" length="8" />
<sequence name="die3" start="209" length="8" /> <sequence name="die3" start="209" length="8" />
<sequence name="die4" start="217" length="12" /> <sequence name="die4" start="217" length="12" />
<sequence name="die5" start="229" length="18" /> <sequence name="die5" start="229" length="18" />
<sequence name="die6" start="0" length="14" src="electro" /> <sequence name="die6" start="0" length="14" src="electro" />
<sequence name="crawl-0" start="130" length="4" /> <sequence name="crawl-0" start="130" length="4" />
<sequence name="crawl-1" start="134" length="4" /> <sequence name="crawl-1" start="134" length="4" />
<sequence name="crawl-2" start="138" length="4" /> <sequence name="crawl-2" start="138" length="4" />

4
session.ini
View File

@@ -8,7 +8,3 @@ s0=Multi0,mcv,600,2841,0,Guard,None
s1=Multi2,mcv,600,12445,0,Guard,None s1=Multi2,mcv,600,12445,0,Guard,None
s2=Multi1,mcv,600,12505,0,Guard,None s2=Multi1,mcv,600,12505,0,Guard,None
s3=Multi3,mcv,600,2910,0,Guard,None s3=Multi3,mcv,600,2910,0,Guard,None
s4=Multi7,3tnk,600,13017,0,Guard,None
s5=Multi7,ca,600,13765,0,Guard,None