Merge pull request #3011 from Mailaender/cloaking
Render mines properly again and fix empty camo pillboxes in RA shellmap
This commit is contained in:
@@ -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.
BIN
mods/ra/maps/shellmap/map.bin
Normal file
BIN
mods/ra/maps/shellmap/map.bin
Normal file
Binary file not shown.
1308
mods/ra/maps/shellmap/map.yaml
Normal file
1308
mods/ra/maps/shellmap/map.yaml
Normal file
File diff suppressed because it is too large
Load Diff
@@ -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
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user