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

Simplify 'default' expression (IDE0034)

Browse Source
This commit is contained in:
Gustas
2022-10-11 17:28:58 +03:00
committed by Matthias Mailänder
parent 02d9ba020d
commit 858d782af1
70 changed files with 90 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Traits/Air/Aircraft.cs
View File

@@ -86,10 +86,10 @@ namespace OpenRA.Mods.Common.Traits
public readonly bool MoveIntoShroud = true;
[Desc("e.g. crate, wall, infantry")]
public readonly BitSet<CrushClass> Crushes = default(BitSet<CrushClass>);
public readonly BitSet<CrushClass> Crushes = default;
[Desc("Types of damage that are caused while crushing. Leave empty for no damage types.")]
public readonly BitSet<DamageType> CrushDamageTypes = default(BitSet<DamageType>);
public readonly BitSet<DamageType> CrushDamageTypes = default;
[VoiceReference]
public readonly string Voice = "Action";

2
OpenRA.Mods.Common/Traits/AppearsOnMapPreview.cs
View File

@@ -20,7 +20,7 @@ namespace OpenRA.Mods.Common.Traits
public class AppearsOnMapPreviewInfo : TraitInfo<AppearsOnMapPreview>, IMapPreviewSignatureInfo, Requires<IOccupySpaceInfo>
{
[Desc("Use this color to render the actor, instead of owner player color.")]
public readonly Color Color = default(Color);
public readonly Color Color = default;
[Desc("Use this terrain color to render the actor, instead of owner player color.",
"Overrides `Color` if both set.")]

2
OpenRA.Mods.Common/Traits/BotModules/SquadManagerBotModule.cs
View File

@@ -80,7 +80,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly int ProtectionScanRadius = 8;
[Desc("Enemy target types to never target.")]
public readonly BitSet<TargetableType> IgnoredEnemyTargetTypes = default(BitSet<TargetableType>);
public readonly BitSet<TargetableType> IgnoredEnemyTargetTypes = default;
public override void RulesetLoaded(Ruleset rules, ActorInfo ai)
{

2
OpenRA.Mods.Common/Traits/Buildings/Bridge.cs
View File

@@ -49,7 +49,7 @@ namespace OpenRA.Mods.Common.Traits
public WeaponInfo DemolishWeaponInfo { get; private set; }
[Desc("Types of damage that this bridge causes to units over/in path of it while being destroyed/repaired. Leave empty for no damage types.")]
public readonly BitSet<DamageType> DamageTypes = default(BitSet<DamageType>);
public readonly BitSet<DamageType> DamageTypes = default;
public override object Create(ActorInitializer init) { return new Bridge(init.Self, this); }

2
OpenRA.Mods.Common/Traits/Buildings/GroundLevelBridge.cs
View File

@@ -33,7 +33,7 @@ namespace OpenRA.Mods.Common.Traits
public WeaponInfo DemolishWeaponInfo { get; private set; }
[Desc("Types of damage that this bridge causes to units over/in path of it while being destroyed/repaired. Leave empty for no damage types.")]
public readonly BitSet<DamageType> DamageTypes = default(BitSet<DamageType>);
public readonly BitSet<DamageType> DamageTypes = default;
public void RulesetLoaded(Ruleset rules, ActorInfo ai)
{

2
OpenRA.Mods.Common/Traits/Buildings/RepairableBuilding.cs
View File

@@ -30,7 +30,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly int RepairStep = 7;
[Desc("Damage types used for the repair.")]
public readonly BitSet<DamageType> RepairDamageTypes = default(BitSet<DamageType>);
public readonly BitSet<DamageType> RepairDamageTypes = default;
[Desc("The percentage repair bonus applied with increasing numbers of repairers.")]
public readonly int[] RepairBonuses = { 100, 150, 175, 200, 220, 240, 260, 280, 300 };

2
OpenRA.Mods.Common/Traits/Capturable.cs
View File

@@ -20,7 +20,7 @@ namespace OpenRA.Mods.Common.Traits
{
[FieldLoader.Require]
[Desc("CaptureTypes (from the Captures trait) that are able to capture this.")]
public readonly BitSet<CaptureType> Types = default(BitSet<CaptureType>);
public readonly BitSet<CaptureType> Types = default;
[Desc("What player relationships the target's owner needs to be captured by this actor.")]
public readonly PlayerRelationship ValidRelationships = PlayerRelationship.Neutral | PlayerRelationship.Enemy;

2
OpenRA.Mods.Common/Traits/CaptureManager.cs
View File

@@ -105,7 +105,7 @@ namespace OpenRA.Mods.Common.Traits
public void RefreshCapturable()
{
allyCapturableTypes = neutralCapturableTypes = enemyCapturableTypes = default(BitSet<CaptureType>);
allyCapturableTypes = neutralCapturableTypes = enemyCapturableTypes = default;
foreach (var c in enabledCapturable)
{
if (c.Info.ValidRelationships.HasRelationship(PlayerRelationship.Ally))

4
OpenRA.Mods.Common/Traits/Captures.cs
View File

@@ -22,7 +22,7 @@ namespace OpenRA.Mods.Common.Traits
{
[FieldLoader.Require]
[Desc("Types of actors that it can capture, as long as the type also exists in the Capturable Type: trait.")]
public readonly BitSet<CaptureType> CaptureTypes = default(BitSet<CaptureType>);
public readonly BitSet<CaptureType> CaptureTypes = default;
[Desc("Targets with health above this percentage will be sabotaged instead of captured.",
"Set to 0 to disable sabotaging.")]
@@ -32,7 +32,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly int SabotageHPRemoval = 50;
[Desc("Damage types that applied with the sabotage damage.")]
public readonly BitSet<DamageType> SabotageDamageTypes = default(BitSet<DamageType>);
public readonly BitSet<DamageType> SabotageDamageTypes = default;
[Desc("Delay (in ticks) that to wait next to the target before initiating the capture.")]
public readonly int CaptureDelay = 0;

2
OpenRA.Mods.Common/Traits/ChangesHealth.cs
View File

@@ -36,7 +36,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly int DamageCooldown = 0;
[Desc("Apply the health change when encountering these damage types.")]
public readonly BitSet<DamageType> DamageTypes = default(BitSet<DamageType>);
public readonly BitSet<DamageType> DamageTypes = default;
public override object Create(ActorInitializer init) { return new ChangesHealth(init.Self, this); }
}

2
OpenRA.Mods.Common/Traits/Crates/HealActorsCrateAction.cs
View File

@@ -19,7 +19,7 @@ namespace OpenRA.Mods.Common.Traits
class HealActorsCrateActionInfo : CrateActionInfo
{
[Desc("The target type(s) of the actors this crate action will heal. Leave empty to heal all actors.")]
public readonly BitSet<TargetableType> TargetTypes = default(BitSet<TargetableType>);
public readonly BitSet<TargetableType> TargetTypes = default;
public override object Create(ActorInitializer init) { return new HealActorsCrateAction(init.Self, this); }
}

3
OpenRA.Mods.Common/Traits/Crushable.cs
View File

@@ -10,7 +10,6 @@
#endregion
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
@@ -57,7 +56,7 @@ namespace OpenRA.Mods.Common.Traits
Game.Sound.Play(SoundType.World, Info.CrushSound, crusher.CenterPosition);
var crusherMobile = crusher.TraitOrDefault<Mobile>();
self.Kill(crusher, crusherMobile != null ? crusherMobile.Info.LocomotorInfo.CrushDamageTypes : default(BitSet<DamageType>));
self.Kill(crusher, crusherMobile != null ? crusherMobile.Info.LocomotorInfo.CrushDamageTypes : default);
}
bool ICrushable.CrushableBy(Actor self, Actor crusher, BitSet<CrushClass> crushClasses)

2
OpenRA.Mods.Common/Traits/DamagedByTerrain.cs
View File

@@ -27,7 +27,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly int DamageInterval = 0;
[Desc("Apply the damage using these damagetypes.")]
public readonly BitSet<DamageType> DamageTypes = default(BitSet<DamageType>);
public readonly BitSet<DamageType> DamageTypes = default;
[FieldLoader.Require]
[Desc("Terrain types where the actor will take damage.")]

2
OpenRA.Mods.Common/Traits/Demolition.cs
View File

@@ -38,7 +38,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly EnterBehaviour EnterBehaviour = EnterBehaviour.Exit;
[Desc("Types of damage that this trait causes. Leave empty for no damage types.")]
public readonly BitSet<DamageType> DamageTypes = default(BitSet<DamageType>);
public readonly BitSet<DamageType> DamageTypes = default;
[VoiceReference]
[Desc("Voice string when planting explosive charges.")]

2
OpenRA.Mods.Common/Traits/EngineerRepair.cs
View File

@@ -21,7 +21,7 @@ namespace OpenRA.Mods.Common.Traits
public class EngineerRepairInfo : ConditionalTraitInfo
{
[Desc("Uses the \"EngineerRepairable\" trait to determine repairability.")]
public readonly BitSet<EngineerRepairType> Types = default(BitSet<EngineerRepairType>);
public readonly BitSet<EngineerRepairType> Types = default;
[VoiceReference]
public readonly string Voice = "Action";

2
OpenRA.Mods.Common/Traits/EngineerRepairable.cs
View File

@@ -19,7 +19,7 @@ namespace OpenRA.Mods.Common.Traits
public class EngineerRepairableInfo : ConditionalTraitInfo
{
[Desc("Actors with these Types under EngineerRepair trait can repair me.")]
public readonly BitSet<EngineerRepairType> Types = default(BitSet<EngineerRepairType>);
public readonly BitSet<EngineerRepairType> Types = default;
public override object Create(ActorInitializer init) { return new EngineerRepairable(this); }
}

2
OpenRA.Mods.Common/Traits/Explodes.cs
View File

@@ -42,7 +42,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly int DamageThreshold = 0;
[Desc("DeathType(s) that trigger the explosion. Leave empty to always trigger an explosion.")]
public readonly BitSet<DamageType> DeathTypes = default(BitSet<DamageType>);
public readonly BitSet<DamageType> DeathTypes = default;
[Desc("Who is counted as source of damage for explosion.",
"Possible values are Self and Killer.")]

2
OpenRA.Mods.Common/Traits/GivesBounty.cs
View File

@@ -31,7 +31,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("DeathTypes for which a bounty should be granted.",
"Use an empty list (the default) to allow all DeathTypes.")]
public readonly BitSet<DamageType> DeathTypes = default(BitSet<DamageType>);
public readonly BitSet<DamageType> DeathTypes = default;
public override object Create(ActorInitializer init) { return new GivesBounty(this); }
}

2
OpenRA.Mods.Common/Traits/GivesCashOnCapture.cs
View File

@@ -27,7 +27,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly int Amount = 0;
[Desc("Award cash only if the capturer's CaptureTypes overlap with these types. Leave empty to allow all types.")]
public readonly BitSet<CaptureType> CaptureTypes = default(BitSet<CaptureType>);
public readonly BitSet<CaptureType> CaptureTypes = default;
public override object Create(ActorInitializer init) { return new GivesCashOnCapture(this); }
}

2
OpenRA.Mods.Common/Traits/HitShape.cs
View File

@@ -33,7 +33,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Defines which Armor types apply when the actor receives damage to this HitShape.",
"If none specified, all armor types the actor has are valid.")]
public readonly BitSet<ArmorType> ArmorTypes = default(BitSet<ArmorType>);
public readonly BitSet<ArmorType> ArmorTypes = default;
[FieldLoader.LoadUsing(nameof(LoadShape))]
[Desc("Engine comes with support for `Circle`, `Capsule`, `Polygon` and `Rectangle`. Defaults to `Circle` when left empty.")]

2
OpenRA.Mods.Common/Traits/Infantry/TakeCover.cs
View File

@@ -28,7 +28,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Damage types that trigger prone state. Defined on the warheads.",
"If Duration is negative (permanent), you can leave this empty to trigger prone state immediately.")]
public readonly BitSet<DamageType> DamageTriggers = default(BitSet<DamageType>);
public readonly BitSet<DamageType> DamageTriggers = default;
[Desc("Damage modifiers for each damage type (defined on the warheads) while the unit is prone.")]
public readonly Dictionary<string, int> DamageModifiers = new Dictionary<string, int>();

2
OpenRA.Mods.Common/Traits/KillsSelf.cs
View File

@@ -23,7 +23,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly int[] Delay = { 0 };
[Desc("Types of damage that this trait causes. Leave empty for no damage types.")]
public readonly BitSet<DamageType> DamageTypes = default(BitSet<DamageType>);
public readonly BitSet<DamageType> DamageTypes = default;
[GrantedConditionReference]
[Desc("The condition to grant moments before suiciding.")]

2
OpenRA.Mods.Common/Traits/OwnerLostAction.cs
View File

@@ -29,7 +29,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly string Owner = "Neutral";
[Desc("The deathtypes used when 'Action' is 'Kill'.")]
public readonly BitSet<DamageType> DeathTypes = default(BitSet<DamageType>);
public readonly BitSet<DamageType> DeathTypes = default;
public override object Create(ActorInitializer init) { return new OwnerLostAction(this); }
}

2
OpenRA.Mods.Common/Traits/Parachutable.cs
View File

@@ -24,7 +24,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly bool KilledOnImpassableTerrain = true;
[Desc("Types of damage that this trait causes to self when 'KilledOnImpassableTerrain' is true. Leave empty for no damage types.")]
public readonly BitSet<DamageType> DamageTypes = default(BitSet<DamageType>);
public readonly BitSet<DamageType> DamageTypes = default;
[Desc("Image where Ground/WaterCorpseSequence is looked up.")]
public readonly string Image = "explosion";

2
OpenRA.Mods.Common/Traits/ProximityCaptor.cs
View File

@@ -18,7 +18,7 @@ namespace OpenRA.Mods.Common.Traits
public class ProximityCaptorInfo : TraitInfo<ProximityCaptor>
{
[FieldLoader.Require]
public readonly BitSet<CaptureType> Types = default(BitSet<CaptureType>);
public readonly BitSet<CaptureType> Types = default;
}
public class ProximityCaptor { }

2
OpenRA.Mods.Common/Traits/Render/WithDamageOverlay.cs
View File

@@ -38,7 +38,7 @@ namespace OpenRA.Mods.Common.Traits.Render
[Desc("Damage types that this should be used for (defined on the warheads).",
"Leave empty to disable all filtering.")]
public readonly BitSet<DamageType> DamageTypes = default(BitSet<DamageType>);
public readonly BitSet<DamageType> DamageTypes = default;
[Desc("Trigger when Undamaged, Light, Medium, Heavy, Critical or Dead.")]
public readonly DamageState MinimumDamageState = DamageState.Heavy;

2
OpenRA.Mods.Common/Traits/RepairsUnits.cs
View File

@@ -25,7 +25,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly int Interval = 24;
[Desc("Damage types used for the repair.")]
public readonly BitSet<DamageType> RepairDamageTypes = default(BitSet<DamageType>);
public readonly BitSet<DamageType> RepairDamageTypes = default;
[NotificationReference("Speech")]
[Desc("Speech notification played when starting to repair a unit.")]

2
OpenRA.Mods.Common/Traits/RevealOnDeath.cs
View File

@@ -32,7 +32,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("DeathTypes for which shroud will be revealed.",
"Use an empty list (the default) to allow all DeathTypes.")]
public readonly BitSet<DamageType> DeathTypes = default(BitSet<DamageType>);
public readonly BitSet<DamageType> DeathTypes = default;
public override object Create(ActorInitializer init) { return new RevealOnDeath(this); }
}

2
OpenRA.Mods.Common/Traits/ShakeOnDeath.cs
View File

@@ -17,7 +17,7 @@ namespace OpenRA.Mods.Common.Traits
public class ShakeOnDeathInfo : TraitInfo
{
[Desc("DeathType(s) that trigger the shake. Leave empty to always trigger a shake.")]
public readonly BitSet<DamageType> DeathTypes = default(BitSet<DamageType>);
public readonly BitSet<DamageType> DeathTypes = default;
public readonly int Duration = 10;
public readonly int Intensity = 1;

2
OpenRA.Mods.Common/Traits/Sound/DeathSounds.cs
View File

@@ -26,7 +26,7 @@ namespace OpenRA.Mods.Common.Traits.Sound
[Desc("Damage types that this should be used for (defined on the warheads).",
"If empty, this will be used as the default sound for all death types.")]
public readonly BitSet<DamageType> DeathTypes = default(BitSet<DamageType>);
public readonly BitSet<DamageType> DeathTypes = default;
public override object Create(ActorInitializer init) { return new DeathSounds(this); }
}

2
OpenRA.Mods.Common/Traits/Sound/SoundOnDamageTransition.cs
View File

@@ -24,7 +24,7 @@ namespace OpenRA.Mods.Common.Traits.Sound
public readonly string[] DestroyedSounds = Array.Empty<string>();
[Desc("DamageType(s) that trigger the sounds. Leave empty to always trigger a sound.")]
public readonly BitSet<DamageType> DamageTypes = default(BitSet<DamageType>);
public readonly BitSet<DamageType> DamageTypes = default;
public override object Create(ActorInitializer init) { return new SoundOnDamageTransition(this); }
}

2
OpenRA.Mods.Common/Traits/TransformCrusherOnCrush.cs
View File

@@ -24,7 +24,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly bool SkipMakeAnims = true;
public readonly BitSet<CrushClass> CrushClasses = default(BitSet<CrushClass>);
public readonly BitSet<CrushClass> CrushClasses = default;
public override object Create(ActorInitializer init) { return new TransformCrusherOnCrush(init, this); }
}

2
OpenRA.Mods.Common/Traits/TransformOnCapture.cs
View File

@@ -27,7 +27,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly bool SkipMakeAnims = true;
[Desc("Transform only if the capturer's CaptureTypes overlap with these types. Leave empty to allow all types.")]
public readonly BitSet<CaptureType> CaptureTypes = default(BitSet<CaptureType>);
public readonly BitSet<CaptureType> CaptureTypes = default;
public override object Create(ActorInitializer init) { return new TransformOnCapture(init, this); }
}

10
OpenRA.Mods.Common/Traits/World/Locomotor.cs
View File

@@ -73,10 +73,10 @@ namespace OpenRA.Mods.Common.Traits
public readonly bool MoveIntoShroud = true;
[Desc("e.g. crate, wall, infantry")]
public readonly BitSet<CrushClass> Crushes = default(BitSet<CrushClass>);
public readonly BitSet<CrushClass> Crushes = default;
[Desc("Types of damage that are caused while crushing. Leave empty for no damage types.")]
public readonly BitSet<DamageType> CrushDamageTypes = default(BitSet<DamageType>);
public readonly BitSet<DamageType> CrushDamageTypes = default;
[FieldLoader.LoadUsing(nameof(LoadSpeeds), true)]
[Desc("Lower the value on rough terrain. Leave out entries for impassable terrain.")]
@@ -134,7 +134,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly LongBitSet<PlayerBitMask> Crushable;
public readonly CellFlag CellFlag;
public CellCache(LongBitSet<PlayerBitMask> immovable, CellFlag cellFlag, LongBitSet<PlayerBitMask> crushable = default(LongBitSet<PlayerBitMask>))
public CellCache(LongBitSet<PlayerBitMask> immovable, CellFlag cellFlag, LongBitSet<PlayerBitMask> crushable = default)
{
Immovable = immovable;
Crushable = crushable;
@@ -467,13 +467,13 @@ namespace OpenRA.Mods.Common.Traits
if (!actors.Any())
{
cache[cell] = new CellCache(default(LongBitSet<PlayerBitMask>), cellFlag);
cache[cell] = new CellCache(default, cellFlag);
return;
}
if (sharesCell && actorMap.HasFreeSubCell(cell))
{
cache[cell] = new CellCache(default(LongBitSet<PlayerBitMask>), cellFlag);
cache[cell] = new CellCache(default, cellFlag);
return;
}

2
OpenRA.Mods.Common/Traits/World/SmudgeLayer.cs
View File

@@ -180,7 +180,7 @@ namespace OpenRA.Mods.Common.Traits
if (!world.Map.Contains(loc))
return;
var tile = dirty.ContainsKey(loc) ? dirty[loc] : default(Smudge);
var tile = dirty.ContainsKey(loc) ? dirty[loc] : default;
// Setting Sequence to null to indicate a deleted smudge.
tile.Sequence = null;

2
OpenRA.Mods.Common/Warheads/DamageWarhead.cs
View File

@@ -24,7 +24,7 @@ namespace OpenRA.Mods.Common.Warheads
public readonly int Damage = 0;
[Desc("Types of damage that this warhead causes. Leave empty for no damage types.")]
public readonly BitSet<DamageType> DamageTypes = default(BitSet<DamageType>);
public readonly BitSet<DamageType> DamageTypes = default;
[Desc("Damage percentage versus each armor type.")]
public readonly Dictionary<string, int> Versus = new Dictionary<string, int>();

8
OpenRA.Mods.Common/Widgets/Logic/ReplayBrowserLogic.cs
View File

@@ -836,10 +836,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
public string Faction;
public bool IsEmpty =>
Type == default(GameType)
&& Date == default(DateType)
&& Duration == default(DurationType)
&& Outcome == default(WinState)
Type == default
&& Date == default
&& Duration == default
&& Outcome == default
&& string.IsNullOrEmpty(PlayerName)
&& string.IsNullOrEmpty(MapName)
&& string.IsNullOrEmpty(Faction);

2
OpenRA.Mods.Common/Widgets/ProductionPaletteWidget.cs
View File

@@ -443,7 +443,7 @@ namespace OpenRA.Mods.Common.Widgets
public void RefreshIcons()
{
icons = new Dictionary<Rectangle, ProductionIcon>();
var producer = CurrentQueue != null ? CurrentQueue.MostLikelyProducer() : default(TraitPair<Production>);
var producer = CurrentQueue != null ? CurrentQueue.MostLikelyProducer() : default;
if (CurrentQueue == null || producer.Trait == null)
{
if (DisplayedIconCount != 0)