Build prep branches on Travis, too

The bug happens when a second (or third, fourth etc.) Conyard deploys while a building is placed from the first Conyard.

The `WithMakeAnimation` running on the second CY uses `Animation::PlayThen` to call `Building::Unlock` in a delegate.

`WithBuildingPlacedAnimation::BuildingPlaced` runs when a building placed and replaces the delegate from `WithMakeAnimation` with its own before it has a chance to run, and so the new Conyard never gets unlocked.

The fix is then to simply not run `BuildingPlaced` on conyards that haven't completed the make animation yet.

(cherry picked from commit a9339d91ea)

.travis.yml

@@ -36,6 +36,7 @@ branches:
    - /^release-.*$/
    - /^playtest-.*$/
    - /^pkgtest-.*$/
+   - /^prep-.*$/
    - bleed
 
 # Notify developers when build passed/failed.

Makefile

@@ -319,6 +319,7 @@ osx-dependencies: cli-dependencies
 
 dependencies: $(os-dependencies)
 	@./thirdparty/fetch-geoip-db.sh
+	@ $(CP) thirdparty/download/GeoLite2-Country.mmdb.gz .
 
 all-dependencies: cli-dependencies windows-dependencies osx-dependencies
 

OpenRA.Game/Actor.cs

@@ -242,12 +242,17 @@ namespace OpenRA
 					return;
 
 				var oldOwner = Owner;
+				var wasInWorld = IsInWorld;
 
 				// momentarily remove from world so the ownership queries don't get confused
-				w.Remove(this);
+				if (wasInWorld)
+					w.Remove(this);
+
 				Owner = newOwner;
 				Generation++;
-				w.Add(this);
+
+				if (wasInWorld)
+					w.Add(this);
 
 				foreach (var t in this.TraitsImplementing<INotifyOwnerChanged>())
 					t.OnOwnerChanged(this, oldOwner, newOwner);

OpenRA.Game/Graphics/LineRenderer.cs

@@ -83,6 +83,7 @@ namespace OpenRA.Graphics
 			if (nv + 2 > renderer.TempBufferSize)
 				Flush();
 
+			color = Util.PremultiplyAlpha(color);
 			var r = color.R / 255.0f;
 			var g = color.G / 255.0f;
 			var b = color.B / 255.0f;
@@ -98,12 +99,14 @@ namespace OpenRA.Graphics
 			if (nv + 2 > renderer.TempBufferSize)
 				Flush();
 
+			startColor = Util.PremultiplyAlpha(startColor);
 			var r = startColor.R / 255.0f;
 			var g = startColor.G / 255.0f;
 			var b = startColor.B / 255.0f;
 			var a = startColor.A / 255.0f;
 			vertices[nv++] = new Vertex(start + Offset, r, g, b, a);
 
+			endColor = Util.PremultiplyAlpha(endColor);
 			r = endColor.R / 255.0f;
 			g = endColor.G / 255.0f;
 			b = endColor.B / 255.0f;
@@ -115,6 +118,7 @@ namespace OpenRA.Graphics
 		{
 			renderer.CurrentBatchRenderer = this;
 
+			color = Util.PremultiplyAlpha(color);
 			var r = color.R / 255.0f;
 			var g = color.G / 255.0f;
 			var b = color.B / 255.0f;

OpenRA.Game/Graphics/QuadRenderer.cs

@@ -51,6 +51,7 @@ namespace OpenRA.Graphics
 			if (nv + 4 > renderer.TempBufferSize)
 				Flush();
 
+			color = Util.PremultiplyAlpha(color);
 			var r = color.R / 255.0f;
 			var g = color.G / 255.0f;
 			var b = color.B / 255.0f;

OpenRA.Game/Graphics/Util.cs

@@ -118,6 +118,18 @@ namespace OpenRA.Graphics
 			return Color.FromArgb(c.A, (byte)(c.R * a + 0.5f), (byte)(c.G * a + 0.5f), (byte)(c.B * a + 0.5f));
 		}
 
+		public static Color PremultipliedColorLerp(float t, Color c1, Color c2)
+		{
+			// Colors must be lerped in a non-multiplied color space
+			var a1 = 255f / c1.A;
+			var a2 = 255f / c2.A;
+			return PremultiplyAlpha(Color.FromArgb(
+				(int)(t * c2.A + (1 - t) * c1.A),
+				(int)((byte)(t * a2 * c2.R + 0.5f) + (1 - t) * (byte)(a1 * c1.R + 0.5f)),
+				(int)((byte)(t * a2 * c2.G + 0.5f) + (1 - t) * (byte)(a1 * c1.G + 0.5f)),
+				(int)((byte)(t * a2 * c2.B + 0.5f) + (1 - t) * (byte)(a1 * c1.B + 0.5f))));
+		}
+
 		public static float[] IdentityMatrix()
 		{
 			return Exts.MakeArray(16, j => (j % 5 == 0) ? 1.0f : 0);

OpenRA.Mods.Common/EditorBrushes/EditorResourceBrush.cs

@@ -106,7 +106,6 @@ namespace OpenRA.Mods.Common.Widgets
 
 			var cellScreenPosition = worldRenderer.ScreenPxPosition(location);
 			var cellScreenPixel = worldRenderer.Viewport.WorldToViewPx(cellScreenPosition);
-			var zoom = worldRenderer.Viewport.Zoom;
 
 			preview.Bounds.X = cellScreenPixel.X;
 			preview.Bounds.Y = cellScreenPixel.Y;

OpenRA.Mods.Common/Traits/Mobile.cs

@@ -68,7 +68,7 @@ namespace OpenRA.Mods.Common.Traits
 			var ret = new Dictionary<string, TerrainInfo>();
 			foreach (var t in y.ToDictionary()["TerrainSpeeds"].Nodes)
 			{
-				var speed = FieldLoader.GetValue<decimal>("speed", t.Value.Value);
+				var speed = FieldLoader.GetValue<int>("speed", t.Value.Value);
 				var nodesDict = t.Value.ToDictionary();
 				var cost = nodesDict.ContainsKey("PathingCost")
 					? FieldLoader.GetValue<int>("cost", nodesDict["PathingCost"].Value)
@@ -100,7 +100,7 @@ namespace OpenRA.Mods.Common.Traits
 			public static readonly TerrainInfo Impassable = new TerrainInfo();
 
 			public readonly int Cost;
-			public readonly decimal Speed;
+			public readonly int Speed;
 
 			public TerrainInfo()
 			{
@@ -108,7 +108,7 @@ namespace OpenRA.Mods.Common.Traits
 				Speed = 0;
 			}
 
-			public TerrainInfo(decimal speed, int cost)
+			public TerrainInfo(int speed, int cost)
 			{
 				Speed = speed;
 				Cost = cost;
@@ -311,7 +311,7 @@ namespace OpenRA.Mods.Common.Traits
 		internal int TicksBeforePathing = 0;
 
 		readonly Actor self;
-		readonly ISpeedModifier[] speedModifiers;
+		readonly Lazy<ISpeedModifier[]> speedModifiers;
 		public readonly MobileInfo Info;
 		public bool IsMoving { get; set; }
 
@@ -351,7 +351,7 @@ namespace OpenRA.Mods.Common.Traits
 			self = init.Self;
 			Info = info;
 
-			speedModifiers = self.TraitsImplementing<ISpeedModifier>().ToArray();
+			speedModifiers = Exts.Lazy(() => self.TraitsImplementing<ISpeedModifier>().ToArray());
 
 			ToSubCell = FromSubCell = info.SharesCell ? init.World.Map.DefaultSubCell : SubCell.FullCell;
 			if (init.Contains<SubCellInit>())
@@ -593,16 +593,13 @@ namespace OpenRA.Mods.Common.Traits
 			if (index == byte.MaxValue)
 				return 0;
 
-			// TODO: Convert to integers
-			var speed = Info.TilesetTerrainInfo[self.World.TileSet][index].Speed;
-			if (speed == decimal.Zero)
+			var terrainSpeed = Info.TilesetTerrainInfo[self.World.TileSet][index].Speed;
+			if (terrainSpeed == 0)
 				return 0;
 
-			speed *= Info.Speed;
-			foreach (var t in speedModifiers)
-				speed *= t.GetSpeedModifier() / 100m;
+			var modifiers = speedModifiers.Value.Select(x => x.GetSpeedModifier()).Append(terrainSpeed);
 
-			return (int)(speed / 100);
+			return Util.ApplyPercentageModifiers(Info.Speed, modifiers);
 		}
 
 		public void AddInfluence()

OpenRA.Mods.Common/Traits/PaletteEffects/NukePaletteEffect.cs

@@ -15,6 +15,8 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common.Traits
 {
+	using GUtil = OpenRA.Graphics.Util;
+
 	[Desc("Apply palette full screen rotations during atom bomb explosions. Add this to the world actor.")]
 	class NukePaletteEffectInfo : TraitInfo<NukePaletteEffect> { }
 
@@ -46,8 +48,8 @@ namespace OpenRA.Mods.Common.Traits
 				for (var x = 0; x < Palette.Size; x++)
 				{
 					var orig = pal.Value.GetColor(x);
-					var white = Color.FromArgb(orig.A, 255, 255, 255);
-					pal.Value.SetColor(x, Exts.ColorLerp(frac, orig, white));
+					var final = GUtil.PremultipliedColorLerp(frac, orig, GUtil.PremultiplyAlpha(Color.FromArgb(orig.A, Color.White)));
+					pal.Value.SetColor(x, final);
 				}
 			}
 		}

OpenRA.Mods.Common/Traits/Render/WithBuildingPlacedAnimation.cs

@@ -21,20 +21,28 @@ namespace OpenRA.Mods.Common.Traits
 		public object Create(ActorInitializer init) { return new WithBuildingPlacedAnimation(init.Self, this); }
 	}
 
-	public class WithBuildingPlacedAnimation : INotifyBuildingPlaced
+	public class WithBuildingPlacedAnimation : INotifyBuildingPlaced, INotifyBuildComplete
 	{
 		WithBuildingPlacedAnimationInfo info;
 		RenderSimple renderSimple;
+		bool buildComplete;
 
 		public WithBuildingPlacedAnimation(Actor self, WithBuildingPlacedAnimationInfo info)
 		{
 			this.info = info;
 			renderSimple = self.Trait<RenderSimple>();
+			buildComplete = !self.HasTrait<Building>();
+		}
+
+		public void BuildingComplete(Actor self)
+		{
+			buildComplete = true;
 		}
 
 		public void BuildingPlaced(Actor self)
 		{
-			renderSimple.PlayCustomAnim(self, info.Sequence);
+			if (buildComplete)
+				renderSimple.PlayCustomAnim(self, info.Sequence);
 		}
 	}
 }

OpenRA.Mods.RA/Graphics/TeslaZapRenderable.cs

@@ -70,6 +70,10 @@ namespace OpenRA.Mods.RA.Graphics
 		public void RenderDebugGeometry(WorldRenderer wr) { }
 		public void Render(WorldRenderer wr)
 		{
+			if (wr.World.FogObscures(wr.World.Map.CellContaining(pos)) &&
+				wr.World.FogObscures(wr.World.Map.CellContaining(pos + length)))
+				return;
+
 			if (!cache.Any() || length != cachedLength || pos != cachedPos)
 				cache = GenerateRenderables(wr);
 

make.ps1

@@ -116,6 +116,7 @@ elseif ($command -eq "dependencies")
 	cd thirdparty
 	./fetch-thirdparty-deps.ps1
 	cp download/*.dll ..
+	cp download/GeoLite2-Country.mmdb.gz ..
 	cp download/windows/*.dll ..
 	cd ..
 	echo "Dependencies copied."

mods/cnc/maps/gdi01/map.yaml

@@ -554,7 +554,7 @@ Weapons:
 			Versus:
 				Heavy: 50
 			Damage: 50
-			DamageTypes: Prone50Percent, TriggerProne
+			DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 
 Voices:
 

mods/cnc/maps/gdi05b/gdi05b.lua

@@ -101,7 +101,7 @@ Atk5TriggerFunction = function()
 end
 
 StartProduction = function(type)
-	if Hand1.IsInWorld then
+	if Hand1.IsInWorld and Hand1.Owner == nod then
 		Hand1.Build(type)
 		Trigger.AfterDelay(DateTime.Seconds(30), function() StartProduction(type) end)
 	end

mods/cnc/maps/gdi05b/map.yaml

@@ -41,7 +41,7 @@ Players:
 		Name: Nod
 		Race: nod
 		ColorRamp: 3,255,127
-		Enemies: GDI, Neutral, AbandonedBase
+		Enemies: GDI, AbandonedBase
 	PlayerReference@GDI:
 		Name: GDI
 		Playable: True
@@ -60,10 +60,8 @@ Players:
 		NonCombatant: True
 		Race: gdi
 		ColorRamp: 31,222,183
-		Enemies: Nod
 	PlayerReference@AbandonedBase:
 		Name: AbandonedBase
-		OwnsWorld: True
 		NonCombatant: True
 		Race: gdi
 		ColorRamp: 31,222,183

mods/cnc/maps/nod02a/nod02a.lua

@@ -234,7 +234,7 @@ Tick = function()
 		Nod.MarkCompletedObjective(NodObjective1)
 	end
 
-	if DateTime.GameTime % DateTime.Seconds(3) == 0 and Barracks.IsInWorld then
+	if DateTime.GameTime % DateTime.Seconds(3) == 0 and Barracks.IsInWorld and Barracks.Owner == gdi then
 		checkProduction(GDI)
 	end
 end
@@ -267,8 +267,8 @@ getStartUnits = function()
 	end)
 end
 
-IdleHunt = function(unit) 
-	if not unit.IsDead then 
-		Trigger.OnIdle(unit, unit.Hunt) 
-	end 
-end
+IdleHunt = function(unit)
+	if not unit.IsDead then
+		Trigger.OnIdle(unit, unit.Hunt)
+	end
+end

mods/cnc/maps/nod02b/nod02b.lua

@@ -152,7 +152,7 @@ Tick = function()
 		Nod.MarkCompletedObjective(NodObjective1)
 	end
 
-	if DateTime.GameTime % DateTime.Seconds(3) == 0 and Barracks.IsInWorld then
+	if DateTime.GameTime % DateTime.Seconds(3) == 0 and Barracks.IsInWorld and Barracks.Owner == gdi then
 		checkProduction(GDI)
 	end
 end
@@ -234,8 +234,8 @@ InsertNodUnits = function()
 	Reinforcements.Reinforce(Nod, { "mcv" }, { McvEntry.Location, McvRally.Location })
 end
 
-IdleHunt = function(unit) 
-	if not unit.IsDead then 
-		Trigger.OnIdle(unit, unit.Hunt) 
-	end 
-end
+IdleHunt = function(unit)
+	if not unit.IsDead then
+		Trigger.OnIdle(unit, unit.Hunt)
+	end
+end

mods/cnc/maps/nod05/map.yaml

@@ -229,7 +229,7 @@ Actors:
 		Owner: Neutral
 	Actor66: v32
 		Location: 19,41
-		Owner: Special
+		Owner: Neutral
 	Actor67: v30
 		Location: 15,40
 		Owner: Neutral

mods/cnc/maps/nod05/nod05.lua

@@ -295,9 +295,9 @@ checkProduction = function(player)
 			end
 		end
 		if #UnitsType > 0 then
-			if (type == 'jeep' or type == 'mtnk') and not Factory.IsDead then
+			if (type == 'jeep' or type == 'mtnk') and not Factory.IsDead and Factory.Owner == gdi then
 				Factory.Build(UnitsType)
-			elseif (type == 'e1' or type == 'e2') and not Barracks.IsDead then
+			elseif (type == 'e1' or type == 'e2') and not Barracks.IsDead and Barracks.Owner == gdi then
 				Barracks.Build(UnitsType)
 			end
 		end

mods/d2k/chrome/tooltips.yaml

@@ -115,7 +115,7 @@ Background@CLIENT_TOOLTIP:
 
 Background@PRODUCTION_TOOLTIP:
 	Logic: ProductionTooltipLogic
-	Background: dialog4
+	Background: dialog3
 	Width: 200
 	Height: 65
 	Children:
@@ -172,40 +172,40 @@ Background@PRODUCTION_TOOLTIP:
 
 Background@SUPPORT_POWER_TOOLTIP:
 	Logic: SupportPowerTooltipLogic
-	Background: dialog4
+	Background: dialog3
 	Width: 200
-	Height: 29
+	Height: 36
 	Children:
 		Label@NAME:
 			X: 7
 			Y: 2
-			Height: 20
+			Height: 23
 			Font: Bold
 		Label@HOTKEY:
 			Visible: false
 			Y: 2
-			Height: 20
+			Height: 23
 			TextColor: 255,255,0
 			Font: Bold
 		Label@TIME:
-			Y: 8
+			Y: 9
 			Font: TinyBold
 			VAlign: Top
 		Label@DESC:
 			X: 7
-			Y: 22
+			Y: 28
 			Font: TinyBold
 			VAlign: Top
 
 Background@FACTION_DESCRIPTION_TOOLTIP:
 	Logic: CountryTooltipLogic
-	Background: dialog4
+	Background: dialog3
 	Children:
 		Label@HEADER:
 			X: 7
-			Y: 6
+			Y: 7
 			Width: 8
-			Height: 12
+			Height: 10
 			Font: Bold
 			VAlign: Top
 		Label@DESCRIPTION:
@@ -214,4 +214,4 @@ Background@FACTION_DESCRIPTION_TOOLTIP:
 			Width: 15
 			Height: 14
 			Font: TinyBold
-			VAlign: Top
+			VAlign: Top

mods/d2k/rules/palettes.yaml

@@ -57,6 +57,11 @@
 		Name: effect50alpha
 		BasePalette: effect
 		Alpha: 0.5
+	PaletteFromPaletteWithAlpha@effectAdditive:
+		Name: effectAdditive
+		BasePalette: effect
+		Alpha: 0
+		Premultiply: false
 	PaletteFromScaledPalette@starportlights:
 		Name: starportlights
 		BasePalette: d2k
@@ -81,4 +86,5 @@
 		Alpha: 0.68
 		Premultiply: false
 	PlayerHighlightPalette:
+	NukePaletteEffect:
 

mods/d2k/rules/structures.yaml

@@ -213,6 +213,7 @@ refinery:
 			ordos: refinery.ordos
 	WithDockingOverlay@SMOKE:
 		Sequence: smoke
+		Palette: effectAdditive
 	Power:
 		Amount: -30
 	WithIdleOverlay@TOP:

mods/d2k/rules/vehicles.yaml

@@ -351,7 +351,7 @@ raider:
 stealthraider:
 	Inherits: raider
 	Buildable:
-		Prerequisites: ~light.ordos, upgrade.light, ~techlevel.medium
+		Prerequisites: ~light.ordos, upgrade.light, hightech, ~techlevel.medium
 		BuildPaletteOrder: 30
 	Valued:
 		Cost: 400

mods/d2k/sequences/structures.yaml

@@ -378,7 +378,6 @@ refinery.atreides:
 		Length: 14
 		Offset: 10,-16
 		Tick: 200
-		BlendMode: Additive
 
 silo.atreides:
 	idle: DATA.R8
@@ -863,7 +862,6 @@ refinery.harkonnen:
 		Length: 14
 		Offset: 10,-16
 		Tick: 200
-		BlendMode: Additive
 
 silo.harkonnen:
 	idle: DATA.R8
@@ -1257,7 +1255,6 @@ refinery.ordos:
 		Length: 14
 		Offset: 10,-16
 		Tick: 200
-		BlendMode: Additive
 
 silo.ordos:
 	idle: DATA.R8

mods/d2k/weapons.yaml

@@ -392,7 +392,7 @@ NerveGasMissile:
 			None: 0
 			Wood: 0
 			Concrete: 0
-		DamageTypes: Prone50Percent, TriggerProne
+		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: SandCrater, RockCrater
 	Warhead@3Eff: CreateEffect

mods/ra/maps/allies-01/map.yaml

@@ -562,7 +562,7 @@ Weapons:
 		Burst: 1
 		Warhead: SpreadDamage
 			Damage: 20
-			DamageTypes: Prone50Percent, TriggerProne
+			DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 
 Voices:
 

mods/ra/maps/allies-02/map.yaml

@@ -840,7 +840,7 @@ Weapons:
 		Burst: 1
 		Warhead: SpreadDamage
 			Damage: 20
-			DamageTypes: Prone50Percent, TriggerProne
+			DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 
 Voices:
 

mods/ra/maps/allies-05a/AI.lua

@@ -61,8 +61,8 @@ ProtectHarvester = function(unit)
 
 		local Guards = SetupAttackGroup()
 		Utils.Do(Guards, function(unit)
-			if attacker.Location then
-				unit.AttackMove(attacker.Location)
+			if not self.IsDead then
+				unit.AttackMove(self.Location)
 			end
 			IdleHunt(unit)
 		end)

mods/ra/maps/allies-05a/map.yaml

@@ -1744,6 +1744,8 @@ Rules:
 			Prerequisites: ~disabled
 		ParatroopersPower@paratroopers:
 			Prerequisites: ~disabled
+	FCOM:
+		MustBeDestroyed:
 	4TNK:
 		Buildable:
 			Prerequisites: ~disabled

mods/ra/maps/drop-zone-w/map.yaml

@@ -323,7 +323,7 @@ Weapons:
 				Light: 30
 				Heavy: 30
 			Damage: 400
-			DamageTypes: Prone50Percent, TriggerProne, Explosion
+			DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 		Warhead@1Eff: CreateEffect
 			Explosion: large_explosion
 			WaterExplosion: large_splash

mods/ra/maps/intervention/map.yaml

@@ -2403,7 +2403,7 @@ Weapons:
 	Maverick:
 		Warhead@1Dam: SpreadDamage
 			Damage: 175
-			DamageTypes: Prone50Percent, TriggerProne
+			DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 
 Voices:
 

mods/ra/maps/monster-tank-madness/map.yaml

@@ -2342,6 +2342,9 @@ Rules:
 	SHOK:
 		Buildable:
 			Prerequisites: ~disabled
+	HIJACKER:
+		Buildable:
+			Prerequisites: ~disabled
 	STNK:
 		Buildable:
 			Prerequisites: ~disabled

thirdparty/fetch-geoip-db.sh

@@ -14,6 +14,5 @@ if [[ ! -e $filename ]] || [[ -n $(find . -name $filename -mtime +30 -print) ]];
 	rm -f $filename
 	echo "Updating GeoIP country database from MaxMind."
 	curl -s -L -O http://geolite.maxmind.com/download/geoip/database/$filename
-	cp $filename ../..
 fi
 

thirdparty/fetch-thirdparty-deps.ps1

@@ -135,7 +135,6 @@ if (!(Test-Path "GeoLite2-Country.mmdb.gz") -Or (((get-date) - (get-item "GeoLit
 	echo "Updating GeoIP country database from MaxMind."
 	$target = Join-Path $pwd.ToString() "GeoLite2-Country.mmdb.gz"
 	(New-Object System.Net.WebClient).DownloadFile("http://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.mmdb.gz", $target)
-	cp GeoLite2-Country.mmdb.gz ..\..
 }
 
 cd ..