Merge pull request #3011 from Mailaender/cloaking

Render mines properly again and fix empty camo pillboxes in RA shellmap
This commit is contained in:
Chris Forbes
2013-04-08 13:55:23 -07:00
5 changed files with 1315 additions and 2 deletions

View File

@@ -74,7 +74,10 @@ namespace OpenRA.Mods.RA
return r; return r;
if (Cloaked && IsVisible(self.World.RenderedShroud, self)) if (Cloaked && IsVisible(self.World.RenderedShroud, self))
return r.Select(a => a.WithPalette(wr.Palette(info.Palette))); if (string.IsNullOrEmpty(info.Palette))
return r;
else
return r.Select(a => a.WithPalette(wr.Palette(info.Palette)));
else else
return Nothing; return Nothing;
} }

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@@ -640,6 +640,7 @@ MINP:
Cloak: Cloak:
CloakSound: CloakSound:
UncloakSound: UncloakSound:
Palette:
Tooltip: Tooltip:
Name: Anti-Personnel Mine Name: Anti-Personnel Mine
Icon: jmin Icon: jmin
@@ -659,6 +660,7 @@ MINV:
Cloak: Cloak:
CloakSound: CloakSound:
UncloakSound: UncloakSound:
Palette:
Tooltip: Tooltip:
Name: Anti-Tank Mine Name: Anti-Tank Mine
Icon: jmin Icon: jmin
@@ -732,7 +734,7 @@ CAMERA:
Health: Health:
HP:1000 HP:1000
RevealsShroud: RevealsShroud:
Range: 10 Range: 10
ProximityCaptor: ProximityCaptor:
Types:Camera Types:Camera