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

Suffix projectile shadow palettes with player name if IsPlayerPalette = true.

Browse Source
This commit is contained in:
darkademic
2022-02-01 12:55:48 +00:00
committed by abcdefg30
parent 9bb41630e7
commit 257ef95963
3 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OpenRA.Mods.Common/Projectiles/Bullet.cs
View File

@@ -287,21 +287,22 @@ namespace OpenRA.Mods.Common.Projectiles
var world = args.SourceActor.World; var world = args.SourceActor.World;
if (!world.FogObscures(pos)) if (!world.FogObscures(pos))
{ {
if (info.Shadow)
{
var dat = world.Map.DistanceAboveTerrain(pos);
var shadowPos = pos - new WVec(0, 0, dat.Length);
foreach (var r in anim.Render(shadowPos, wr.Palette(info.Palette)))
yield return ((IModifyableRenderable)r)
.WithTint(shadowColor, ((IModifyableRenderable)r).TintModifiers | TintModifiers.ReplaceColor)
.WithAlpha(shadowAlpha);
}
var paletteName = info.Palette; var paletteName = info.Palette;
if (paletteName != null && info.IsPlayerPalette) if (paletteName != null && info.IsPlayerPalette)
paletteName += args.SourceActor.Owner.InternalName; paletteName += args.SourceActor.Owner.InternalName;
var palette = wr.Palette(paletteName); var palette = wr.Palette(paletteName);
if (info.Shadow)
{
var dat = world.Map.DistanceAboveTerrain(pos);
var shadowPos = pos - new WVec(0, 0, dat.Length);
foreach (var r in anim.Render(shadowPos, palette))
yield return ((IModifyableRenderable)r)
.WithTint(shadowColor, ((IModifyableRenderable)r).TintModifiers | TintModifiers.ReplaceColor)
.WithAlpha(shadowAlpha);
}
foreach (var r in anim.Render(pos, palette)) foreach (var r in anim.Render(pos, palette))
yield return r; yield return r;
} }

9
OpenRA.Mods.Common/Projectiles/GravityBomb.cs
View File

@@ -120,17 +120,22 @@ namespace OpenRA.Mods.Common.Projectiles
var world = args.SourceActor.World; var world = args.SourceActor.World;
if (!world.FogObscures(pos)) if (!world.FogObscures(pos))
{ {
var paletteName = info.Palette;
if (paletteName != null && info.IsPlayerPalette)
paletteName += args.SourceActor.Owner.InternalName;
var palette = wr.Palette(paletteName);
if (info.Shadow) if (info.Shadow)
{ {
var dat = world.Map.DistanceAboveTerrain(pos); var dat = world.Map.DistanceAboveTerrain(pos);
var shadowPos = pos - new WVec(0, 0, dat.Length); var shadowPos = pos - new WVec(0, 0, dat.Length);
foreach (var r in anim.Render(shadowPos, wr.Palette(info.Palette))) foreach (var r in anim.Render(shadowPos, palette))
yield return ((IModifyableRenderable)r) yield return ((IModifyableRenderable)r)
.WithTint(shadowColor, ((IModifyableRenderable)r).TintModifiers | TintModifiers.ReplaceColor) .WithTint(shadowColor, ((IModifyableRenderable)r).TintModifiers | TintModifiers.ReplaceColor)
.WithAlpha(shadowAlpha); .WithAlpha(shadowAlpha);
} }
var palette = wr.Palette(info.Palette + (info.IsPlayerPalette ? args.SourceActor.Owner.InternalName : ""));
foreach (var r in anim.Render(pos, palette)) foreach (var r in anim.Render(pos, palette))
yield return r; yield return r;
} }

9
OpenRA.Mods.Common/Projectiles/Missile.cs
View File

@@ -921,17 +921,22 @@ namespace OpenRA.Mods.Common.Projectiles
var world = args.SourceActor.World; var world = args.SourceActor.World;
if (!world.FogObscures(pos)) if (!world.FogObscures(pos))
{ {
var paletteName = info.Palette;
if (paletteName != null && info.IsPlayerPalette)
paletteName += args.SourceActor.Owner.InternalName;
var palette = wr.Palette(paletteName);
if (info.Shadow) if (info.Shadow)
{ {
var dat = world.Map.DistanceAboveTerrain(pos); var dat = world.Map.DistanceAboveTerrain(pos);
var shadowPos = pos - new WVec(0, 0, dat.Length); var shadowPos = pos - new WVec(0, 0, dat.Length);
foreach (var r in anim.Render(shadowPos, wr.Palette(info.Palette))) foreach (var r in anim.Render(shadowPos, palette))
yield return ((IModifyableRenderable)r) yield return ((IModifyableRenderable)r)
.WithTint(shadowColor, ((IModifyableRenderable)r).TintModifiers | TintModifiers.ReplaceColor) .WithTint(shadowColor, ((IModifyableRenderable)r).TintModifiers | TintModifiers.ReplaceColor)
.WithAlpha(shadowAlpha); .WithAlpha(shadowAlpha);
} }
var palette = wr.Palette(info.Palette + (info.IsPlayerPalette ? args.SourceActor.Owner.InternalName : ""));
foreach (var r in anim.Render(pos, palette)) foreach (var r in anim.Render(pos, palette))
yield return r; yield return r;
} }