Replace * 25 in internal tick defaults with actual total

While the idea behind it is understandable,
this was inconsistent with the bulk of other defaults.
This commit is contained in:
reaperrr
2021-03-21 00:11:12 +01:00
committed by teinarss
parent 52d39db84a
commit e3fd54e147
9 changed files with 9 additions and 9 deletions

View File

@@ -21,7 +21,7 @@ namespace OpenRA.Mods.Cnc.Traits
public readonly BitSet<TargetableType> Types = default(BitSet<TargetableType>); public readonly BitSet<TargetableType> Types = default(BitSet<TargetableType>);
[Desc("Measured in ticks.")] [Desc("Measured in ticks.")]
public readonly int Duration = 25 * 20; public readonly int Duration = 500;
[NotificationReference("Speech")] [NotificationReference("Speech")]
[Desc("Sound the victim will hear when they get sabotaged.")] [Desc("Sound the victim will hear when they get sabotaged.")]

View File

@@ -30,7 +30,7 @@ namespace OpenRA.Mods.Common.Scripting
[Desc("Creates a new beacon that stays for the specified time at the specified WPos. " + [Desc("Creates a new beacon that stays for the specified time at the specified WPos. " +
"Does not remove player set beacons, nor gets removed by placing them. " + "Does not remove player set beacons, nor gets removed by placing them. " +
"Requires the 'PlaceBeacon' trait on the player actor.")] "Requires the 'PlaceBeacon' trait on the player actor.")]
public void New(Player owner, WPos position, int duration = 30 * 25, bool showRadarPings = true) public void New(Player owner, WPos position, int duration = 750, bool showRadarPings = true)
{ {
var beacon = owner.PlayerActor.Info.TraitInfoOrDefault<PlaceBeaconInfo>(); var beacon = owner.PlayerActor.Info.TraitInfoOrDefault<PlaceBeaconInfo>();
if (beacon == null) if (beacon == null)

View File

@@ -27,7 +27,7 @@ namespace OpenRA.Mods.Common.Scripting
} }
[Desc("Creates a new radar ping that stays for the specified time at the specified WPos.")] [Desc("Creates a new radar ping that stays for the specified time at the specified WPos.")]
public void Ping(Player player, WPos position, Color color, int duration = 30 * 25) public void Ping(Player player, WPos position, Color color, int duration = 750)
{ {
radarPings?.Add(() => player.World.RenderPlayer == player, position, color, duration); radarPings?.Add(() => player.World.RenderPlayer == player, position, color, duration);
} }

View File

@@ -22,7 +22,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly int PanicChance = 100; public readonly int PanicChance = 100;
[Desc("How long (in ticks) the actor should panic for.")] [Desc("How long (in ticks) the actor should panic for.")]
public readonly int PanicLength = 25 * 10; public readonly int PanicLength = 250;
[Desc("Panic movement speed as a percentage of the normal speed.")] [Desc("Panic movement speed as a percentage of the normal speed.")]
public readonly int PanicSpeedModifier = 200; public readonly int PanicSpeedModifier = 200;

View File

@@ -25,7 +25,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly Color RadarPingColor = Color.Red; public readonly Color RadarPingColor = Color.Red;
[Desc("Length of time (in ticks) to display a location ping in the minimap.")] [Desc("Length of time (in ticks) to display a location ping in the minimap.")]
public readonly int RadarPingDuration = 10 * 25; public readonly int RadarPingDuration = 250;
[NotificationReference("Speech")] [NotificationReference("Speech")]
[Desc("The audio notification type to play.")] [Desc("The audio notification type to play.")]

View File

@@ -25,7 +25,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly Color RadarPingColor = Color.Red; public readonly Color RadarPingColor = Color.Red;
[Desc("Length of time (in ticks) to display a location ping in the minimap.")] [Desc("Length of time (in ticks) to display a location ping in the minimap.")]
public readonly int RadarPingDuration = 10 * 25; public readonly int RadarPingDuration = 250;
[NotificationReference("Speech")] [NotificationReference("Speech")]
[Desc("The audio notification type to play.")] [Desc("The audio notification type to play.")]

View File

@@ -18,7 +18,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("A beacon that is constructed from a circle sprite that is animated once and a moving arrow sprite.")] [Desc("A beacon that is constructed from a circle sprite that is animated once and a moving arrow sprite.")]
public class PlaceBeaconInfo : TraitInfo public class PlaceBeaconInfo : TraitInfo
{ {
public readonly int Duration = 30 * 25; public readonly int Duration = 750;
public readonly string NotificationType = "Sounds"; public readonly string NotificationType = "Sounds";

View File

@@ -114,7 +114,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly bool DisplayRadarPing = false; public readonly bool DisplayRadarPing = false;
[Desc("Measured in ticks.")] [Desc("Measured in ticks.")]
public readonly int RadarPingDuration = 5 * 25; public readonly int RadarPingDuration = 125;
public readonly string OrderName; public readonly string OrderName;

View File

@@ -46,7 +46,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly int Maximum = 255; public readonly int Maximum = 255;
[Desc("Average time (ticks) between crate spawn.")] [Desc("Average time (ticks) between crate spawn.")]
public readonly int SpawnInterval = 180 * 25; public readonly int SpawnInterval = 4500;
[Desc("Delay (in ticks) before the first crate spawns.")] [Desc("Delay (in ticks) before the first crate spawns.")]
public readonly int InitialSpawnDelay = 0; public readonly int InitialSpawnDelay = 0;