Skip to content

Commit

Permalink
Replace * 25 in internal tick defaults with actual total
Browse files Browse the repository at this point in the history
While the idea behind it is understandable,
this was inconsistent with the bulk of other defaults.
  • Loading branch information
reaperrr authored and teinarss committed Apr 19, 2021
1 parent 52d39db commit e3fd54e
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class InfiltrateForPowerOutageInfo : TraitInfo
public readonly BitSet<TargetableType> Types = default(BitSet<TargetableType>);

[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.")]
Expand Down
2 changes: 1 addition & 1 deletion OpenRA.Mods.Common/Scripting/Global/BeaconGlobal.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public BeaconGlobal(ScriptContext context)
[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<PlaceBeaconInfo>();
if (beacon == null)
Expand Down
2 changes: 1 addition & 1 deletion OpenRA.Mods.Common/Scripting/Global/RadarGlobal.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public RadarGlobal(ScriptContext context)
}

[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);
}
Expand Down
2 changes: 1 addition & 1 deletion OpenRA.Mods.Common/Traits/Infantry/ScaredyCat.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class ScaredyCatInfo : TraitInfo, Requires<MobileInfo>
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;
Expand Down
2 changes: 1 addition & 1 deletion OpenRA.Mods.Common/Traits/Player/BaseAttackNotifier.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class BaseAttackNotifierInfo : TraitInfo
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.")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class HarvesterAttackNotifierInfo : TraitInfo
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.")]
Expand Down
2 changes: 1 addition & 1 deletion OpenRA.Mods.Common/Traits/Player/PlaceBeacon.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
2 changes: 1 addition & 1 deletion OpenRA.Mods.Common/Traits/SupportPowers/SupportPower.cs
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public abstract class SupportPowerInfo : PausableConditionalTraitInfo
public readonly bool DisplayRadarPing = false;

[Desc("Measured in ticks.")]
public readonly int RadarPingDuration = 5 * 25;
public readonly int RadarPingDuration = 125;

public readonly string OrderName;

Expand Down
2 changes: 1 addition & 1 deletion OpenRA.Mods.Common/Traits/World/CrateSpawner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public class CrateSpawnerInfo : TraitInfo, ILobbyOptions
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;
Expand Down

0 comments on commit e3fd54e

Please sign in to comment.