More style fixes.

MustaphaTR · Mar 15, 2024 · 233aa77 · 233aa77
1 parent b72cef1
commit 233aa77
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 19 deletions.
diff --git a/OpenRA.Mods.AS/Duplicates/Widgets/Logic/Ingame/ObserverStatsRVLogic.cs b/OpenRA.Mods.AS/Duplicates/Widgets/Logic/Ingame/ObserverStatsRVLogic.cs
@@ -183,7 +183,7 @@ StatsDropDownOption CreateStatsOption(string title, ObserverStatsRVPanel panel,
 
 			var statsDropDownOptions = new StatsDropDownOption[]
 			{
-				new StatsDropDownOption
+				new()
 				{
 					Title = TranslationProvider.GetString(InformationNone),
 					IsSelected = () => activePanel == ObserverStatsRVPanel.None,

diff --git a/OpenRA.Mods.AS/Duplicates/Widgets/Logic/Ingame/ObserverStatsSPLogic.cs b/OpenRA.Mods.AS/Duplicates/Widgets/Logic/Ingame/ObserverStatsSPLogic.cs
@@ -175,7 +175,7 @@ StatsDropDownOption CreateStatsOption(string title, ObserverStatsSPPanel panel,
 
 			var statsDropDownOptions = new StatsDropDownOption[]
 			{
-				new StatsDropDownOption
+				new()
 				{
 					Title = TranslationProvider.GetString(InformationNone),
 					IsSelected = () => activePanel == ObserverStatsSPPanel.None,

diff --git a/OpenRA.Mods.AS/Projectiles/WarheadTrailProjectile.cs b/OpenRA.Mods.AS/Projectiles/WarheadTrailProjectile.cs
@@ -29,10 +29,10 @@ public enum FireMode
 	public class WarheadTrailProjectileInfo : IProjectileInfo, IRulesetLoaded<WeaponInfo>
 	{
 		[Desc("Warhead explosion offsets")]
-		public readonly WVec[] Offsets = { new WVec(0, 1, 0) };
+		public readonly WVec[] Offsets = { new(0, 1, 0) };
 
 		[Desc("Projectile speed in WDist / tick, two values indicate variable velocity.")]
-		public readonly WDist[] Speed = { new WDist(17) };
+		public readonly WDist[] Speed = { new(17) };
 
 		[Desc("Maximum inaccuracy offset.")]
 		public readonly WDist Inaccuracy = WDist.Zero;

diff --git a/OpenRA.Mods.AS/Traits/BotModules/CaptureManagerBotASModule.cs b/OpenRA.Mods.AS/Traits/BotModules/CaptureManagerBotASModule.cs
@@ -228,7 +228,7 @@ List<MiniYamlNode> IGameSaveTraitData.IssueTraitData(Actor self)
 
 			return new List<MiniYamlNode>()
 			{
-				new MiniYamlNode("InitialBaseCenter", FieldSaver.FormatValue(initialBaseCenter))
+				new("InitialBaseCenter", FieldSaver.FormatValue(initialBaseCenter))
 			};
 		}
 

diff --git a/OpenRA.Mods.AS/Traits/BotModules/SupportPowerBotASModule.cs b/OpenRA.Mods.AS/Traits/BotModules/SupportPowerBotASModule.cs
@@ -165,7 +165,7 @@ List<MiniYamlNode> IGameSaveTraitData.IssueTraitData(Actor self)
 
 			return new List<MiniYamlNode>()
 			{
-				new MiniYamlNode("WaitingPowers", "", waitingPowersNodes)
+				new("WaitingPowers", "", waitingPowersNodes)
 			};
 		}
 

diff --git a/OpenRA.Mods.AS/Warheads/FireFragmentWarhead.cs b/OpenRA.Mods.AS/Warheads/FireFragmentWarhead.cs
@@ -28,7 +28,7 @@ public class FireFragmentWarhead : WarheadAS, IRulesetLoaded<WeaponInfo>
 		public readonly int Chance = 100;
 
 		[Desc("Target offsets relative to warhead explosion.")]
-		public readonly WVec[] Offsets = { new WVec(0, 0, 0) };
+		public readonly WVec[] Offsets = { new(0, 0, 0) };
 
 		[Desc("If set, Offset's Z value will be used as absolute height instead of explosion height.")]
 		public readonly bool UseZOffsetAsAbsoluteHeight = false;

diff --git a/OpenRA.Mods.Common/Projectiles/GravityBomb.cs b/OpenRA.Mods.Common/Projectiles/GravityBomb.cs
@@ -101,7 +101,7 @@ public void Tick(World world)
 			pos += velocity;
 			velocity += acceleration;
 
-			if (info.PointDefenseTypes.Any())
+			if (!info.PointDefenseTypes.IsEmpty)
 			{
 				var shouldExplode = world.ActorsWithTrait<IPointDefense>().Any(x => x.Trait.Destroy(pos, args.SourceActor.Owner, info.PointDefenseTypes));
 				if (shouldExplode)
@@ -132,16 +132,6 @@ public void Tick(World world)
 				args.Weapon.Impact(Target.FromPos(pos), warheadArgs);
 			}
 
-			if (info.PointDefenseTypes.Any())
-			{
-				var shouldExplode = world.ActorsWithTrait<IPointDefense>().Any(x => x.Trait.Destroy(pos, args.SourceActor.Owner, info.PointDefenseTypes));
-				if (shouldExplode)
-				{
-					args.Weapon.Impact(Target.FromPos(pos), new WarheadArgs(args));
-					world.AddFrameEndTask(w => w.Remove(this));
-				}
-			}
-
 			anim?.Tick();
 		}
 

diff --git a/OpenRA.Mods.Common/Projectiles/Missile.cs b/OpenRA.Mods.Common/Projectiles/Missile.cs
@@ -889,7 +889,7 @@ public void Tick(World world)
 				pos = blockedPos;
 				shouldExplode = true;
 			}
-			else if (info.PointDefenseTypes.Any() && world.ActorsWithTrait<IPointDefense>().Any(a => a.Trait.Destroy(pos, args.SourceActor.Owner, info.PointDefenseTypes)))
+			else if (!info.PointDefenseTypes.IsEmpty && world.ActorsWithTrait<IPointDefense>().Any(a => a.Trait.Destroy(pos, args.SourceActor.Owner, info.PointDefenseTypes)))
 			{
 				shouldExplode = true;
 			}