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

much simpler rules loader

Browse Source
This commit is contained in:
Chris Forbes
2010-04-01 21:31:15 +13:00
parent c5fdda9141
commit 38605faecf
16 changed files with 110 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Traits/AI/SelfHealing.cs
View File

@@ -44,7 +44,7 @@ namespace OpenRA.Traits
if (--ticks <= 0)
{
ticks = info.Ticks;
self.InflictDamage(self, -info.Step, Rules.WarheadInfo["Super"]);
self.InflictDamage(self, -info.Step, null);
}
}
}

2
OpenRA.Game/Traits/Activities/Repair.cs
View File

@@ -51,7 +51,7 @@ namespace OpenRA.Traits.Activities
return this;
}
self.InflictDamage(self, -hpToRepair, Rules.WarheadInfo["Super"]);
self.InflictDamage(self, -hpToRepair, null);
if (self.Health == hp)
return NextActivity;

2
OpenRA.Game/Traits/Building.cs
View File

@@ -135,7 +135,7 @@ namespace OpenRA.Traits
}
self.World.AddFrameEndTask(w => w.Add(new RepairIndicator(self)));
self.InflictDamage(self, -hpToRepair, Rules.WarheadInfo["Super"]);
self.InflictDamage(self, -hpToRepair, null);
if (self.Health == maxHP)
{
isRepairing = false;

3
OpenRA.Game/Traits/SquishByTank.cs
View File

@@ -35,7 +35,8 @@ namespace OpenRA.Traits
public void OnCrush(Actor crusher)
{
self.InflictDamage(crusher, self.Health, Rules.WarheadInfo["Crush"]);
// ... this wasnt working ANYWAY ...
// self.InflictDamage(crusher, self.Health, Rules.WarheadInfo["Crush"]);
}
public bool IsPathableCrush(UnitMovementType umt, Player player)