Update Mirage Tank logic

cookgreen · Sep 16, 2019 · ce8de3c · ce8de3c
1 parent ff1ce23
commit ce8de3c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 22 deletions.
diff --git a/OpenRA.Mods.YR/Traits/Variety.cs b/OpenRA.Mods.YR/Traits/Variety.cs
@@ -117,27 +117,13 @@ public IEnumerable<IRenderable> ModifyRender(Actor self, WorldRenderer wr, IEnum
             }
 
             if (Varied && IsVisible(self, self.World.RenderPlayer))
-            {
-                if (!string.IsNullOrEmpty(info.Actor))
-                {
-                    if (varietiedActor == null || !varietiedActor.IsInWorld)
-                    {
-                        return createActorAndRender(self.World, info.Actor, wr);
-                    }
-                    else
-                    {
-                        return varietiedActor.Render(wr);
-                    }
-                }
-                else
-                {
-                    var palette = string.IsNullOrEmpty(Info.Palette) ? null : Info.IsPlayerPalette ? wr.Palette(Info.Palette + self.Owner.InternalName) : wr.Palette(Info.Palette);
-                    if (palette == null)
-                        return r;
-                    else
-                        return r.Select(a => a.IsDecoration ? a : a.WithPalette(palette));
-                }
-            }
+			{
+				var palette = string.IsNullOrEmpty(Info.Palette) ? null : Info.IsPlayerPalette ? wr.Palette(Info.Palette + self.Owner.InternalName) : wr.Palette(Info.Palette);
+				if (palette == null)
+					return r;
+				else
+					return r.Select(a => a.IsDecoration ? a : a.WithPalette(palette));
+			}
             else
             {
                 if (!string.IsNullOrEmpty(info.Actor))

diff --git a/mods/yr/rules/allied-vehicles.yaml b/mods/yr/rules/allied-vehicles.yaml
@@ -458,7 +458,7 @@ mgtk:
 	Bunkerable:
 	Variety:
 		Actor: tree28
-		UnvarietyOn: Move
+		IsPlayerPalette: true
 		VarietyCondition: varing
 	Targetable:
 		RequiresCondition: !varing