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

Merge pull request #4676 from cjshmyr/capturing-cursors

Browse Source 
Swap cursors used for sabotaging and capturing buildings
This commit is contained in:
Matthias Mailänder
2014-02-17 14:09:00 +01:00
parent 7ac65d2909 7f4c1addb3
commit 2931f9dfcb
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@@ -13,6 +13,7 @@ NEW:
A player's units, and allied units, now move out of the way when blocking production facilities. A player's units, and allied units, now move out of the way when blocking production facilities.
Added cheat button to grow map resources. Added cheat button to grow map resources.
Fixed units staying selected and contributing to control groups when becoming cloaked or hidden in fog. Fixed units staying selected and contributing to control groups when becoming cloaked or hidden in fog.
Swapped the cursors used for sabotaging and capturing buildings/units.
Dune 2000: Dune 2000:
Added the Atreides grenadier from the 1.06 patch. Added the Atreides grenadier from the 1.06 patch.
Added randomized tiles for Sand and Rock terrain. Added randomized tiles for Sand and Rock terrain.

4
OpenRA.Mods.RA/Captures.cs
View File

@@ -102,7 +102,7 @@ namespace OpenRA.Mods.RA
var lowEnoughHealth = health.HP <= c.CaptureThreshold * health.MaxHP; var lowEnoughHealth = health.HP <= c.CaptureThreshold * health.MaxHP;
cursor = !sabotage || lowEnoughHealth || target.Owner.NonCombatant cursor = !sabotage || lowEnoughHealth || target.Owner.NonCombatant
? "capture" : "enter"; ? "enter" : "capture";
return true; return true;
} }
@@ -119,7 +119,7 @@ namespace OpenRA.Mods.RA
var lowEnoughHealth = target.HP <= c.CaptureThreshold * health.HP; var lowEnoughHealth = target.HP <= c.CaptureThreshold * health.HP;
cursor = !sabotage || lowEnoughHealth || target.Owner.NonCombatant cursor = !sabotage || lowEnoughHealth || target.Owner.NonCombatant
? "capture" : "enter"; ? "enter" : "capture";
return true; return true;
} }