diff --git a/OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForPowerOutage.cs b/OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForPowerOutage.cs index fc4b0eb4e2..a6351138bb 100644 --- a/OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForPowerOutage.cs +++ b/OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForPowerOutage.cs @@ -21,7 +21,7 @@ namespace OpenRA.Mods.Cnc.Traits public readonly BitSet Types = default(BitSet); [Desc("Measured in ticks.")] - public readonly int Duration = 25 * 20; + public readonly int Duration = 500; [NotificationReference("Speech")] [Desc("Sound the victim will hear when they get sabotaged.")] diff --git a/OpenRA.Mods.Common/Scripting/Global/BeaconGlobal.cs b/OpenRA.Mods.Common/Scripting/Global/BeaconGlobal.cs index 16a8f92009..0e866d83ea 100644 --- a/OpenRA.Mods.Common/Scripting/Global/BeaconGlobal.cs +++ b/OpenRA.Mods.Common/Scripting/Global/BeaconGlobal.cs @@ -30,7 +30,7 @@ namespace OpenRA.Mods.Common.Scripting [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. " + "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(); if (beacon == null) diff --git a/OpenRA.Mods.Common/Scripting/Global/RadarGlobal.cs b/OpenRA.Mods.Common/Scripting/Global/RadarGlobal.cs index f50d90c1bc..cfa39278ee 100644 --- a/OpenRA.Mods.Common/Scripting/Global/RadarGlobal.cs +++ b/OpenRA.Mods.Common/Scripting/Global/RadarGlobal.cs @@ -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.")] - 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); } diff --git a/OpenRA.Mods.Common/Traits/Infantry/ScaredyCat.cs b/OpenRA.Mods.Common/Traits/Infantry/ScaredyCat.cs index b8171c7721..2476c9f3a9 100644 --- a/OpenRA.Mods.Common/Traits/Infantry/ScaredyCat.cs +++ b/OpenRA.Mods.Common/Traits/Infantry/ScaredyCat.cs @@ -22,7 +22,7 @@ namespace OpenRA.Mods.Common.Traits public readonly int PanicChance = 100; [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.")] public readonly int PanicSpeedModifier = 200; diff --git a/OpenRA.Mods.Common/Traits/Player/BaseAttackNotifier.cs b/OpenRA.Mods.Common/Traits/Player/BaseAttackNotifier.cs index 7c9658846b..59a4ee0e35 100644 --- a/OpenRA.Mods.Common/Traits/Player/BaseAttackNotifier.cs +++ b/OpenRA.Mods.Common/Traits/Player/BaseAttackNotifier.cs @@ -25,7 +25,7 @@ namespace OpenRA.Mods.Common.Traits public readonly Color RadarPingColor = Color.Red; [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")] [Desc("The audio notification type to play.")] diff --git a/OpenRA.Mods.Common/Traits/Player/HarvesterAttackNotifier.cs b/OpenRA.Mods.Common/Traits/Player/HarvesterAttackNotifier.cs index 60cea97677..19bcd3514a 100644 --- a/OpenRA.Mods.Common/Traits/Player/HarvesterAttackNotifier.cs +++ b/OpenRA.Mods.Common/Traits/Player/HarvesterAttackNotifier.cs @@ -25,7 +25,7 @@ namespace OpenRA.Mods.Common.Traits public readonly Color RadarPingColor = Color.Red; [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")] [Desc("The audio notification type to play.")] diff --git a/OpenRA.Mods.Common/Traits/Player/PlaceBeacon.cs b/OpenRA.Mods.Common/Traits/Player/PlaceBeacon.cs index 93129d185f..17fa5e7eab 100644 --- a/OpenRA.Mods.Common/Traits/Player/PlaceBeacon.cs +++ b/OpenRA.Mods.Common/Traits/Player/PlaceBeacon.cs @@ -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.")] public class PlaceBeaconInfo : TraitInfo { - public readonly int Duration = 30 * 25; + public readonly int Duration = 750; public readonly string NotificationType = "Sounds"; diff --git a/OpenRA.Mods.Common/Traits/SupportPowers/SupportPower.cs b/OpenRA.Mods.Common/Traits/SupportPowers/SupportPower.cs index eaaf838332..fa99f7acf9 100644 --- a/OpenRA.Mods.Common/Traits/SupportPowers/SupportPower.cs +++ b/OpenRA.Mods.Common/Traits/SupportPowers/SupportPower.cs @@ -114,7 +114,7 @@ namespace OpenRA.Mods.Common.Traits public readonly bool DisplayRadarPing = false; [Desc("Measured in ticks.")] - public readonly int RadarPingDuration = 5 * 25; + public readonly int RadarPingDuration = 125; public readonly string OrderName; diff --git a/OpenRA.Mods.Common/Traits/World/CrateSpawner.cs b/OpenRA.Mods.Common/Traits/World/CrateSpawner.cs index 2405d6ba93..591babcd3b 100644 --- a/OpenRA.Mods.Common/Traits/World/CrateSpawner.cs +++ b/OpenRA.Mods.Common/Traits/World/CrateSpawner.cs @@ -46,7 +46,7 @@ namespace OpenRA.Mods.Common.Traits public readonly int Maximum = 255; [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.")] public readonly int InitialSpawnDelay = 0;