- Minor performance improvements.

- Hoplite muzzle.
- Dialed back Hoplite IFV buffs a little.
- Fix Atomic Eradicator selectable class.
- Demo Truck detonates on Tiberium Stealth.
- Fix Mothership shields overlay on Singularity.
- Zeus hits affected by prone & flak vest. Increased damage vs infantry to compensate.

Author: darkademic

OpenRA.Mods.CA/Traits/PeriodicExplosion.cs

@@ -72,6 +72,9 @@ class PeriodicExplosion : ConditionalTrait<PeriodicExplosionInfo>, ITick, INotif
 
 		List<(int Tick, Action Action)> delayedActions = new List<(int, Action)>();
 
+		IFirepowerModifier[] firepowerModifiers;
+		IReloadModifier[] reloadModifiers;
+
 		public PeriodicExplosion(Actor self, PeriodicExplosionInfo info)
 			: base(info)
 		{
@@ -87,6 +90,17 @@ protected override void Created(Actor self)
 		{
 			ammoPool = self.TraitsImplementing<AmmoPool>().FirstOrDefault(la => la.Info.Name == Info.AmmoPoolName);
 
+			if (info.ApplyModifiers)
+			{
+				firepowerModifiers = self.TraitsImplementing<IFirepowerModifier>().ToArray();
+				reloadModifiers = self.TraitsImplementing<IReloadModifier>().ToArray();
+			}
+			else
+			{
+				firepowerModifiers = Array.Empty<IFirepowerModifier>();
+				reloadModifiers = Array.Empty<IReloadModifier>();
+			}
+
 			base.Created(self);
 		}
 
@@ -123,7 +137,7 @@ void ITick.Tick(Actor self)
 				};
 
 				if (info.ApplyModifiers)
-					args.DamageModifiers = self.TraitsImplementing<IFirepowerModifier>().Select(a => a.GetFirepowerModifier()).ToArray();
+					args.DamageModifiers = firepowerModifiers.Select(a => a.GetFirepowerModifier()).ToArray();
 
 				weapon.Impact(Target.FromPos(self.CenterPosition + localoffset), args);
 
@@ -144,7 +158,7 @@ void ITick.Tick(Actor self)
 				{
 					if (info.ApplyModifiers)
 					{
-						var modifiers = self.TraitsImplementing<IReloadModifier>().Select(m => m.GetReloadModifier());
+						var modifiers = reloadModifiers.Select(m => m.GetReloadModifier());
 						fireDelay = Util.ApplyPercentageModifiers(weapon.ReloadDelay, modifiers);
 					}
 					else

OpenRA.Mods.CA/Traits/Render/WithRadiatingCircle.cs

@@ -8,7 +8,7 @@
  */
 #endregion
 
-using System;
+using System.Linq;
 using System.Collections.Generic;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Graphics;
@@ -62,6 +62,7 @@ class WithRadiatingCircle : ConditionalTrait<WithRadiatingCircleInfo>, ITick, IR
 		Queue<RadiatingCircle> activeCircles;
 		int intervalTicks;
 		bool flash;
+		WDist radiusChangePerTick;
 
 		struct RadiatingCircle
 		{
@@ -165,7 +166,6 @@ void ITick.Tick(Actor self)
 			}
 
 			// Update all active circles
-			var radiusChangePerTick = (Info.EndRadius - Info.StartRadius) / Info.Duration;
 			var tempCircles = new Queue<RadiatingCircle>();
 			var circleCompleted = false;
 
@@ -195,7 +195,15 @@ void ITick.Tick(Actor self)
 
 		protected override void TraitEnabled(Actor self)
 		{
-			activeCircles.Enqueue(new RadiatingCircle(Info.StartRadius));
+			if (Info.Duration > 0)
+				radiusChangePerTick = (Info.EndRadius - Info.StartRadius) / Info.Duration;
+			else
+				radiusChangePerTick = WDist.Zero;
+
+			if (Info.Interval == 0 || !activeCircles.Any())
+				activeCircles.Enqueue(new RadiatingCircle(Info.StartRadius));
+
+			intervalTicks = 0;
 		}
 
 		protected override void TraitDisabled(Actor self)

mods/ca/bits/hopl.shp

@@ -103,6 +103,8 @@ MSHP:
 	GrantConditionOnPrerequisite@MSHPSHIELDS:
 		Condition: mothership-shields
 		Prerequisites: mothership.shields
+	WithFacingSpriteBody@SHIELDS:
+		RequiresCondition: mothership-shields
 
 MSHP.Husk:
 	FallsToEarth:

mods/ca/maps/ca30-singularity/singularity-rules.yaml

@@ -1475,6 +1475,8 @@ GTNK.squad:
 		Prerequisites: stek, ~vehicles.soviet, ~atomicengines.upgrade, ~erad.upgrade, ~!ovld.upgrade, ~!apoc.upgrade, ~techlevel.high
 		Description: Big and slow tank armed with a radiation cannon.
 		BuildPaletteOrder: 234
+	Selectable:
+		Class: 4tnk.erad
 	Armament@PRIMARY:
 		Weapon: RadBeamWeaponHeavy
 		MuzzlePalette: caneon
@@ -2960,7 +2962,7 @@ DTRK:
 		DeployedCondition: triggered
 	-DamageMultiplier@IRONCURTAIN:
 	KillsSelf:
-		RequiresCondition: invulnerability || triggered || berserk
+		RequiresCondition: invulnerability || tibstealth || triggered || berserk
 	ChronoshiftableCA:
 		ExplodeInstead: true
 	Passenger:
@@ -6789,7 +6791,7 @@ IFV:
 	DamageMultiplier@IRONCURTAIN:
 		RequiresCondition: invulnerability && !ivanturr
 	KillsSelf:
-		RequiresCondition: ivanturr && (invulnerability || triggered || berserk)
+		RequiresCondition: ivanturr && (invulnerability || tibstealth || triggered || berserk)
 	ProximityExternalCondition@MEDIC:
 		RequiresCondition: medturr
 		EnableSound: heal2.aud

mods/ca/rules/vehicles.yaml

@@ -1668,9 +1668,10 @@ HopliteIFVGun:
 	Projectile: LaserZapCA
 		HitAnim: plaserfire
 	Warhead@1Dam: SpreadDamage
-		Damage: 8000
+		Damage: 7000
 		Spread: 288
 		Versus:
+			Wood: 80
 			Heavy: 30
 
 KirovBomb:
@@ -3668,9 +3669,9 @@ ZeusBolt:
 		Spread: 384
 		Falloff: 1000, 448, 192, 50, 18, 7, 0
 		Damage: 3500
-		DamageTypes: TriggerProne, ElectricityDeath
+		DamageTypes: Prone50Percent, TriggerProne, ElectricityDeath, FlakVestMitigatedMinor
 		Versus:
-			None: 80
+			None: 85
 			Wood: 100
 			Concrete: 65
 			Brick: 50