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

Merge pull request #5865 from obrakmann/fix5861

Browse Source 
Fix RepairBuilding not working for AI and Lua scripts
This commit is contained in:
Matthias Mailänder
2014-07-07 20:54:03 +02:00
parent 4fb38c955b 33b916a713
commit d2adc28a00
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.RA/AI/HackyAI.cs
View File

@@ -851,9 +851,11 @@ namespace OpenRA.Mods.RA.AI
if (!e.Attacker.HasTrait<ITargetable>()) if (!e.Attacker.HasTrait<ITargetable>())
return; return;
if (Info.ShouldRepairBuildings && self.HasTrait<RepairableBuilding>()) var rb = self.TraitOrDefault<RepairableBuilding>();
if (Info.ShouldRepairBuildings && rb != null)
{ {
if (e.DamageState > DamageState.Light && e.PreviousDamageState <= DamageState.Light) if (e.DamageState > DamageState.Light && e.PreviousDamageState <= DamageState.Light && !rb.RepairActive)
{ {
BotDebug("Bot noticed damage {0} {1}->{2}, repairing.", BotDebug("Bot noticed damage {0} {1}->{2}, repairing.",
self, e.PreviousDamageState, e.DamageState); self, e.PreviousDamageState, e.DamageState);

3
OpenRA.Mods.RA/Buildings/RepairableBuilding.cs
View File

@@ -38,7 +38,7 @@ namespace OpenRA.Mods.RA.Buildings
Health Health; Health Health;
RepairableBuildingInfo Info; RepairableBuildingInfo Info;
public bool RepairActive = true; public bool RepairActive = false;
public RepairableBuilding(Actor self, RepairableBuildingInfo info) public RepairableBuilding(Actor self, RepairableBuildingInfo info)
{ {
@@ -102,6 +102,7 @@ namespace OpenRA.Mods.RA.Buildings
if (Health.DamageState == DamageState.Undamaged) if (Health.DamageState == DamageState.Undamaged)
{ {
Repairers.Clear(); Repairers.Clear();
RepairActive = false;
return; return;
} }

2
mods/common/lua/actor.lua
View File

@@ -152,7 +152,7 @@ end
Actor.RepairBuilding = function(actor) Actor.RepairBuilding = function(actor)
local rb = Actor.TraitOrDefault(actor, "RepairableBuilding") local rb = Actor.TraitOrDefault(actor, "RepairableBuilding")
if rb ~= nil and rb.Repairer == nil then if rb ~= nil and not rb.RepairActive then
rb:RepairBuilding(actor, Actor.Owner(actor)) rb:RepairBuilding(actor, Actor.Owner(actor))
end end
end end