diff --git a/OpenRA.Mods.Common/Effects/Missile.cs b/OpenRA.Mods.Common/Effects/Missile.cs index b4bdfd068e..cfaa9d53bb 100644 --- a/OpenRA.Mods.Common/Effects/Missile.cs +++ b/OpenRA.Mods.Common/Effects/Missile.cs @@ -143,7 +143,7 @@ namespace OpenRA.Mods.Common.Effects bool JammedBy(TraitPair tp) { - if ((tp.Actor.CenterPosition - pos).HorizontalLengthSquared > tp.Trait.Range * tp.Trait.Range) + if ((tp.Actor.CenterPosition - pos).HorizontalLengthSquared > tp.Trait.Range.LengthSquared) return false; if (tp.Actor.Owner.Stances[args.SourceActor.Owner] == Stance.Ally && !tp.Trait.AlliedMissiles) diff --git a/OpenRA.Mods.Common/Traits/Buildings/BaseProvider.cs b/OpenRA.Mods.Common/Traits/Buildings/BaseProvider.cs index c0521f4f2d..cf491915c2 100644 --- a/OpenRA.Mods.Common/Traits/Buildings/BaseProvider.cs +++ b/OpenRA.Mods.Common/Traits/Buildings/BaseProvider.cs @@ -19,7 +19,7 @@ namespace OpenRA.Mods.Common.Traits [Desc("Limits the zone where buildings can be constructed to a radius around this actor.")] public class BaseProviderInfo : ITraitInfo { - public readonly int Range = 10; + public readonly WDist Range = WDist.FromCells(10); public readonly int Cooldown = 0; public readonly int InitialDelay = 0; @@ -72,7 +72,7 @@ namespace OpenRA.Mods.Common.Traits yield return new RangeCircleRenderable( self.CenterPosition, - WDist.FromCells(Info.Range), + Info.Range, 0, Color.FromArgb(128, Ready() ? Color.White : Color.Red), Color.FromArgb(96, Color.Black)); diff --git a/OpenRA.Mods.Common/Traits/Buildings/Building.cs b/OpenRA.Mods.Common/Traits/Buildings/Building.cs index 7e4238cad5..cf7b1ae1ab 100644 --- a/OpenRA.Mods.Common/Traits/Buildings/Building.cs +++ b/OpenRA.Mods.Common/Traits/Buildings/Building.cs @@ -48,7 +48,7 @@ namespace OpenRA.Mods.Common.Traits // Range is counted from the center of the actor, not from each cell. var target = Target.FromPos(bp.Actor.CenterPosition); - if (target.IsInRange(center, WDist.FromCells(bp.Trait.Info.Range))) + if (target.IsInRange(center, bp.Trait.Info.Range)) return bp.Actor; } diff --git a/OpenRA.Mods.Common/Traits/Cloak.cs b/OpenRA.Mods.Common/Traits/Cloak.cs index 724003419f..b79a7ea02b 100644 --- a/OpenRA.Mods.Common/Traits/Cloak.cs +++ b/OpenRA.Mods.Common/Traits/Cloak.cs @@ -154,7 +154,7 @@ namespace OpenRA.Mods.Common.Traits return self.World.ActorsWithTrait().Any(a => !a.Trait.IsTraitDisabled && a.Actor.Owner.IsAlliedWith(viewer) && Info.CloakTypes.Overlaps(a.Trait.Info.CloakTypes) - && (self.CenterPosition - a.Actor.CenterPosition).Length <= WDist.FromCells(a.Trait.Info.Range).Length); + && (self.CenterPosition - a.Actor.CenterPosition).LengthSquared <= a.Trait.Info.Range.LengthSquared); } public Color RadarColorOverride(Actor self) diff --git a/OpenRA.Mods.Common/Traits/DetectCloaked.cs b/OpenRA.Mods.Common/Traits/DetectCloaked.cs index df1f98737f..fb32a2cc45 100644 --- a/OpenRA.Mods.Common/Traits/DetectCloaked.cs +++ b/OpenRA.Mods.Common/Traits/DetectCloaked.cs @@ -18,8 +18,7 @@ namespace OpenRA.Mods.Common.Traits [Desc("Specific cloak classifications I can reveal.")] public readonly HashSet CloakTypes = new HashSet { "Cloak" }; - [Desc("Measured in cells.")] - public readonly int Range = 5; + public readonly WDist Range = WDist.FromCells(5); public override object Create(ActorInitializer init) { return new DetectCloaked(this); } } diff --git a/OpenRA.Mods.Common/Traits/Guard.cs b/OpenRA.Mods.Common/Traits/Guard.cs index 0fc7182232..9b3f02a3a7 100644 --- a/OpenRA.Mods.Common/Traits/Guard.cs +++ b/OpenRA.Mods.Common/Traits/Guard.cs @@ -49,7 +49,7 @@ namespace OpenRA.Mods.Common.Traits { self.SetTargetLine(target, Color.Yellow); - var range = WDist.FromCells(target.Actor.Info.TraitInfo().Range); + var range = target.Actor.Info.TraitInfo().Range; self.QueueActivity(false, new AttackMoveActivity(self, self.Trait().MoveFollow(self, target, WDist.Zero, range))); } diff --git a/OpenRA.Mods.Common/Traits/Guardable.cs b/OpenRA.Mods.Common/Traits/Guardable.cs index 190db66e40..16a5a19bd7 100644 --- a/OpenRA.Mods.Common/Traits/Guardable.cs +++ b/OpenRA.Mods.Common/Traits/Guardable.cs @@ -15,8 +15,8 @@ namespace OpenRA.Mods.Common.Traits [Desc("This unit can be guarded (followed and protected) by a Guard unit.")] public class GuardableInfo : TraitInfo { - [Desc("Maximum range that guarding actors will maintain. Measured in cells.")] - public readonly int Range = 2; + [Desc("Maximum range that guarding actors will maintain.")] + public readonly WDist Range = WDist.FromCells(2); } public class Guardable { } diff --git a/OpenRA.Mods.Common/Traits/JamsMissiles.cs b/OpenRA.Mods.Common/Traits/JamsMissiles.cs index 974136419e..60c176dc52 100644 --- a/OpenRA.Mods.Common/Traits/JamsMissiles.cs +++ b/OpenRA.Mods.Common/Traits/JamsMissiles.cs @@ -14,7 +14,7 @@ namespace OpenRA.Mods.Common.Traits { public class JamsMissilesInfo : ITraitInfo { - public readonly int Range = 0; + public readonly WDist Range = WDist.Zero; public readonly bool AlliedMissiles = true; public readonly int Chance = 100; @@ -25,8 +25,7 @@ namespace OpenRA.Mods.Common.Traits { readonly JamsMissilesInfo info; - // Convert cells to world units - public int Range { get { return 1024 * info.Range; } } + public WDist Range { get { return info.Range; } } public bool AlliedMissiles { get { return info.AlliedMissiles; } } public int Chance { get { return info.Chance; } } diff --git a/OpenRA.Mods.Common/Traits/ProvidesRadar.cs b/OpenRA.Mods.Common/Traits/ProvidesRadar.cs index 0dc88c22a5..79bad59d30 100644 --- a/OpenRA.Mods.Common/Traits/ProvidesRadar.cs +++ b/OpenRA.Mods.Common/Traits/ProvidesRadar.cs @@ -27,10 +27,9 @@ namespace OpenRA.Mods.Common.Traits // Check if powered if (self.IsDisabled()) return false; - var isJammed = self.World.ActorsWithTrait().Any(a => a.Actor.Owner.Stances[self.Owner] != Stance.Ally - && (self.Location - a.Actor.Location).Length <= a.Actor.Info.TraitInfo().Range); - - return !isJammed; + return self.World.ActorsWithTrait().All(a => a.Actor.Owner.Stances[self.Owner] == Stance.Ally + || (self.CenterPosition - a.Actor.CenterPosition).HorizontalLengthSquared + > a.Actor.Info.TraitInfo().Range.LengthSquared); } } @@ -38,7 +37,7 @@ namespace OpenRA.Mods.Common.Traits public class JamsRadarInfo : TraitInfo { [Desc("Range for jamming.")] - public readonly int Range = 0; + public readonly WDist Range = WDist.Zero; } public class JamsRadar { } diff --git a/OpenRA.Mods.Common/Traits/ProximityCapturable.cs b/OpenRA.Mods.Common/Traits/ProximityCapturable.cs index 0f0dd960cc..376f61e81d 100644 --- a/OpenRA.Mods.Common/Traits/ProximityCapturable.cs +++ b/OpenRA.Mods.Common/Traits/ProximityCapturable.cs @@ -19,7 +19,7 @@ namespace OpenRA.Mods.Common.Traits public class ProximityCapturableInfo : ITraitInfo { public readonly bool Permanent = false; - public readonly int Range = 5; + public readonly WDist Range = WDist.FromCells(5); public readonly bool MustBeClear = false; public readonly HashSet CaptorTypes = new HashSet { "Vehicle", "Tank", "Infantry" }; @@ -111,7 +111,7 @@ namespace OpenRA.Mods.Common.Traits IEnumerable UnitsInRange() { - return Self.World.FindActorsInCircle(Self.CenterPosition, WDist.FromCells(Info.Range)) + return Self.World.FindActorsInCircle(Self.CenterPosition, Info.Range) .Where(a => a.IsInWorld && a != Self && !a.Disposed && !a.Owner.NonCombatant); } diff --git a/OpenRA.Mods.Common/Traits/Render/RenderDetectionCircle.cs b/OpenRA.Mods.Common/Traits/Render/RenderDetectionCircle.cs index 33f49144ef..b3121a99b0 100644 --- a/OpenRA.Mods.Common/Traits/Render/RenderDetectionCircle.cs +++ b/OpenRA.Mods.Common/Traits/Render/RenderDetectionCircle.cs @@ -35,7 +35,7 @@ namespace OpenRA.Mods.Common.Traits var range = self.TraitsImplementing() .Where(a => !a.IsTraitDisabled) - .Select(a => WDist.FromCells(a.Info.Range)) + .Select(a => a.Info.Range) .Append(WDist.Zero).Max(); if (range == WDist.Zero) diff --git a/OpenRA.Mods.Common/Traits/SupportPowers/GrantUpgradePower.cs b/OpenRA.Mods.Common/Traits/SupportPowers/GrantUpgradePower.cs index 02961e2bb9..e901bcab96 100644 --- a/OpenRA.Mods.Common/Traits/SupportPowers/GrantUpgradePower.cs +++ b/OpenRA.Mods.Common/Traits/SupportPowers/GrantUpgradePower.cs @@ -26,7 +26,7 @@ namespace OpenRA.Mods.Common.Traits [Desc("Duration of the upgrade (in ticks). Set to 0 for a permanent upgrade.")] public readonly int Duration = 0; - [Desc("Cells")] + [Desc("Cells - affects whole cells only")] public readonly int Range = 1; public readonly string GrantUpgradeSound = "ironcur9.aud"; diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs index d228724b9f..e27b45ff96 100644 --- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs +++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs @@ -2126,6 +2126,18 @@ namespace OpenRA.Mods.Common.UtilityCommands if (engineVersion < 20150910 && Game.ModData.Manifest.Mod.Id == "d2k") node.Key = RenameD2kActors(node.Key); + // Make Range WDist for all traits with circular ranges. + if (engineVersion < 20150917 && depth == 2 && node.Key == "Range") + { + if (parentKey == "DetectCloaked" + || parentKey == "JamsMissiles" + || parentKey == "JamsRadar" + || parentKey == "Guardable" + || parentKey == "BaseProvider" + || parentKey == "ProximityCapturable") + node.Value.Value = node.Value.Value + "c0"; + } + UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1); } } diff --git a/OpenRA.Mods.RA/Traits/Render/RenderJammerCircle.cs b/OpenRA.Mods.RA/Traits/Render/RenderJammerCircle.cs index 1ab16ae834..c0e055a92f 100644 --- a/OpenRA.Mods.RA/Traits/Render/RenderJammerCircle.cs +++ b/OpenRA.Mods.RA/Traits/Render/RenderJammerCircle.cs @@ -27,7 +27,7 @@ namespace OpenRA.Mods.RA.Traits { yield return new RangeCircleRenderable( centerPosition, - WDist.FromCells(jamsMissiles.Range), + jamsMissiles.Range, 0, Color.FromArgb(128, Color.Red), Color.FromArgb(96, Color.Black)); @@ -38,7 +38,7 @@ namespace OpenRA.Mods.RA.Traits { yield return new RangeCircleRenderable( centerPosition, - WDist.FromCells(jamsRadar.Range), + jamsRadar.Range, 0, Color.FromArgb(128, Color.Blue), Color.FromArgb(96, Color.Black)); @@ -69,7 +69,7 @@ namespace OpenRA.Mods.RA.Traits { yield return new RangeCircleRenderable( self.CenterPosition, - WDist.FromCells(jamsMissiles.Range), + jamsMissiles.Range, 0, Color.FromArgb(128, Color.Red), Color.FromArgb(96, Color.Black)); @@ -80,7 +80,7 @@ namespace OpenRA.Mods.RA.Traits { yield return new RangeCircleRenderable( self.CenterPosition, - WDist.FromCells(jamsRadar.Range), + jamsRadar.Range, 0, Color.FromArgb(128, Color.Blue), Color.FromArgb(96, Color.Black)); diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index b58d80bde9..1db8e2db5c 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -223,7 +223,7 @@ Upgrades: hospitalheal Prerequisites: hosp DetectCloaked: - Range: 1 + Range: 1c0 DeathSounds@NORMAL: DeathTypes: DefaultDeath, BulletDeath, SmallExplosionDeath, ExplosionDeath DeathSounds@BURNED: @@ -448,7 +448,7 @@ Notification: BuildingLost ShakeOnDeath: Guardable: - Range: 3 + Range: 3c0 Tooltip: GenericName: Structure FrozenUnderFog: diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml index 6b78945766..a6c18a1152 100644 --- a/mods/cnc/rules/structures.yaml +++ b/mods/cnc/rules/structures.yaml @@ -64,7 +64,7 @@ FACT: ProductionType: Defence.Nod BaseProvider: Cooldown: 75 - Range: 14 + Range: 14c0 WithBuildingPlacedAnimation: Power: Amount: 0 @@ -471,7 +471,7 @@ HQ: ProvidesRadar: RenderDetectionCircle: DetectCloaked: - Range: 5 + Range: 5c0 AirstrikePower: Prerequisites: ~techlevel.superweapons Icon: airstrike @@ -557,7 +557,7 @@ EYE: ProvidesRadar: RenderDetectionCircle: DetectCloaked: - Range: 5 + Range: 5c0 IonCannonPower: Prerequisites: ~techlevel.superweapons Icon: ioncannon @@ -662,7 +662,7 @@ GUN: WithMuzzleFlash: -WithDeathAnimation: DetectCloaked: - Range: 3 + Range: 3c0 Power: Amount: -20 @@ -746,7 +746,7 @@ OBLI: InitialChargeDelay: 50 -EmitInfantryOnSell: DetectCloaked: - Range: 5 + Range: 5c0 Power: Amount: -150 @@ -778,7 +778,7 @@ GTWR: BodyOrientation: QuantizedFacings: 8 DetectCloaked: - Range: 3 + Range: 3c0 WithMuzzleFlash: Turreted: ROT: 255 @@ -830,7 +830,7 @@ ATWR: BodyOrientation: QuantizedFacings: 8 DetectCloaked: - Range: 5 + Range: 5c0 Power: Amount: -40 diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml index 243866cdc0..787b016110 100644 --- a/mods/d2k/rules/defaults.yaml +++ b/mods/d2k/rules/defaults.yaml @@ -276,7 +276,7 @@ Sellable: SellSounds: BUILD1.WAV Guardable: - Range: 3 + Range: 3c0 WithCrumbleOverlay: Demolishable: DamagedWithoutFoundation: diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index cdc6a51342..c50231b237 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -403,7 +403,7 @@ outpost: Range: 10c0 ProvidesRadar: DetectCloaked: - Range: 6 + Range: 6c0 RenderDetectionCircle: RenderSprites: Image: outpost.harkonnen @@ -558,7 +558,7 @@ medium_gun_turret: LocalOffset: 512,0,432 MuzzleSequence: muzzle DetectCloaked: - Range: 5 + Range: 5c0 Power: Amount: -20 SelectionDecorations: @@ -601,7 +601,7 @@ large_gun_turret: CanPowerDown: DisabledOverlay: DetectCloaked: - Range: 6 + Range: 6c0 Power: Amount: -30 SelectionDecorations: @@ -772,7 +772,7 @@ palace: corrino: palace.corrino RenderDetectionCircle: DetectCloaked: - Range: 4 + Range: 4c0 Power: Amount: -50 ProvidesPrerequisite@nuke: diff --git a/mods/ra/maps/fort-lonestar/map.yaml b/mods/ra/maps/fort-lonestar/map.yaml index c32d4787c9..9566e7e263 100644 --- a/mods/ra/maps/fort-lonestar/map.yaml +++ b/mods/ra/maps/fort-lonestar/map.yaml @@ -570,7 +570,7 @@ Rules: Produces: Defense, Infantry, Soldier, Dog -Sellable: BaseProvider: - Range: 12 + Range: 12c0 Power: Amount: 0 FTUR: diff --git a/mods/ra/maps/koth-hopes-anchor/map.yaml b/mods/ra/maps/koth-hopes-anchor/map.yaml index 50174a9578..6077337b0d 100644 --- a/mods/ra/maps/koth-hopes-anchor/map.yaml +++ b/mods/ra/maps/koth-hopes-anchor/map.yaml @@ -633,7 +633,7 @@ Rules: MISS: ProximityCapturable: MustBeClear: true - Range: 9 + Range: 9c0 CaptorTypes: Ship,Vehicle,Tank,Infantry StrategicPoint: Critical: false diff --git a/mods/ra/maps/soviet-01/map.yaml b/mods/ra/maps/soviet-01/map.yaml index f0231570c7..14f9bc1d43 100644 --- a/mods/ra/maps/soviet-01/map.yaml +++ b/mods/ra/maps/soviet-01/map.yaml @@ -652,7 +652,7 @@ Rules: JEEP: Explodes: JamsRadar: - Range: 10 + Range: 10c0 YAK: Buildable: Prerequisites: ~disabled diff --git a/mods/ra/maps/training-camp/map.yaml b/mods/ra/maps/training-camp/map.yaml index 1519afd549..abeaeb9b94 100644 --- a/mods/ra/maps/training-camp/map.yaml +++ b/mods/ra/maps/training-camp/map.yaml @@ -827,7 +827,7 @@ Rules: Production: Produces: Building, Infantry, Soldier, Dog BaseProvider: - Range: 16 + Range: 16c0 Power: Amount: 0 WEAP: diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 434ad61bd4..43f2289568 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -414,7 +414,7 @@ Types: Building GivesBounty: Guardable: - Range: 3 + Range: 3c0 FrozenUnderFog: GpsRemoveFrozenActor: Tooltip: diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index cff2d499c6..abb9f5db44 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -39,7 +39,7 @@ DOG: StandSequences: stand IgnoresDisguise: DetectCloaked: - Range: 5 + Range: 5c0 Voiced: VoiceSet: DogVoice -TakeCover: @@ -222,7 +222,7 @@ SPY: UpgradeMinEnabledLevel: 1 IgnoresDisguise: DetectCloaked: - Range: 5 + Range: 5c0 Armament: Weapon: SilencedPPK AttackFrontal: @@ -527,7 +527,7 @@ SNIPER: UncloakOnMove: true IsPlayerPalette: true DetectCloaked: - Range: 6 + Range: 6c0 -MustBeDestroyed: ProducibleWithLevel: Prerequisites: barracks.upgraded diff --git a/mods/ra/rules/misc.yaml b/mods/ra/rules/misc.yaml index 29d45ade9d..129625a8f6 100644 --- a/mods/ra/rules/misc.yaml +++ b/mods/ra/rules/misc.yaml @@ -129,7 +129,7 @@ CAMERA: ProximityCaptor: Types: Camera DetectCloaked: - Range: 10 + Range: 10c0 BodyOrientation: QuantizedFacings: 1 WithSpriteBody: @@ -157,7 +157,7 @@ SONAR: ProximityCaptor: Types: Sonar DetectCloaked: - Range: 10 + Range: 10c0 CloakTypes: Underwater FLARE: diff --git a/mods/ra/rules/ships.yaml b/mods/ra/rules/ships.yaml index f4b0165b82..101eed2f4c 100644 --- a/mods/ra/rules/ships.yaml +++ b/mods/ra/rules/ships.yaml @@ -46,7 +46,7 @@ SS: InitialStance: ReturnFire DetectCloaked: CloakTypes: Underwater - Range: 4 + Range: 4c0 RenderDetectionCircle: Explodes: Weapon: UnitExplodeSubmarine @@ -101,7 +101,7 @@ MSUB: InitialStance: ReturnFire DetectCloaked: CloakTypes: Underwater - Range: 4 + Range: 4c0 RenderDetectionCircle: Explodes: Weapon: UnitExplodeSubmarine @@ -151,7 +151,7 @@ DD: AutoTarget: DetectCloaked: CloakTypes: Underwater - Range: 4 + Range: 4c0 RenderDetectionCircle: CA: @@ -279,6 +279,6 @@ PT: AutoTarget: DetectCloaked: CloakTypes: Underwater - Range: 4 + Range: 4c0 RenderDetectionCircle: diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index 539173b831..e2a5497204 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -412,7 +412,7 @@ TSLA: Power: Amount: -100 DetectCloaked: - Range: 8 + Range: 8c0 ProvidesPrerequisite@buildingname: AGUN: @@ -460,7 +460,7 @@ AGUN: Power: Amount: -50 DetectCloaked: - Range: 6 + Range: 6c0 DOME: Inherits: ^Building @@ -491,7 +491,7 @@ DOME: ProvidesRadar: InfiltrateForExploration: DetectCloaked: - Range: 10 + Range: 10c0 RenderDetectionCircle: Power: Amount: -40 @@ -538,7 +538,7 @@ PBOX: Power: Amount: -15 DetectCloaked: - Range: 6 + Range: 6c0 HBOX: Inherits: ^Defense @@ -574,7 +574,7 @@ HBOX: InitialUnits: e1 -EmitInfantryOnSell: DetectCloaked: - Range: 6 + Range: 6c0 RenderRangeCircle: FallbackRange: 6c0 AttackGarrisoned: @@ -620,7 +620,7 @@ GUN: Power: Amount: -40 DetectCloaked: - Range: 7 + Range: 7c0 FTUR: Inherits: ^Defense @@ -655,7 +655,7 @@ FTUR: Power: Amount: -20 DetectCloaked: - Range: 6 + Range: 6c0 ProvidesPrerequisite@buildingname: SAM: @@ -698,7 +698,7 @@ SAM: Power: Amount: -40 DetectCloaked: - Range: 5 + Range: 5c0 ATEK: Inherits: ^Building @@ -895,7 +895,7 @@ FACT: ProductionType: Defense Color: 138,138,138 BaseProvider: - Range: 16 + Range: 16c0 WithBuildingPlacedAnimation: Power: Amount: 0 diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index 275a90e174..0fe7d1c230 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -414,7 +414,7 @@ MNLY.AP: Ammo: 5 RearmSound: minelay1.aud DetectCloaked: - Range: 5 + Range: 5c0 CloakTypes: Mine RenderDetectionCircle: Explodes: @@ -449,7 +449,7 @@ MNLY.AT: Ammo: 5 RearmSound: minelay1.aud DetectCloaked: - Range: 5 + Range: 5c0 CloakTypes: Mine RenderDetectionCircle: Explodes: @@ -532,13 +532,13 @@ MRJ: Sequence: spinner Offset: -256,0,256 JamsRadar: - Range: 15 + Range: 15c0 JamsMissiles: - Range: 4 + Range: 4c0 AlliedMissiles: False RenderJammerCircle: DetectCloaked: - Range: 6 + Range: 6c0 TTNK: Inherits: ^Tank @@ -742,7 +742,7 @@ STNK: UncloakSound: appear1.aud IsPlayerPalette: true DetectCloaked: - Range: 6 + Range: 6c0 -MustBeDestroyed: ProducibleWithLevel: Prerequisites: vehicles.upgraded diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 2482ba5a72..5a90cf06c1 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -96,7 +96,7 @@ ShakeOnDeath: AcceptsSupplies: Guardable: - Range: 3 + Range: 3c0 Demolishable: Cloak@CLOAKGENERATOR: UpgradeTypes: cloakgenerator @@ -624,7 +624,7 @@ RevealsShroud: Range: 6c0 DetectCloaked: - Range: 5 + Range: 5c0 ^DeployedVehicle: Inherits@1: ^GainsExperience diff --git a/mods/ts/rules/gdi-structures.yaml b/mods/ts/rules/gdi-structures.yaml index 259074a9e4..3db370dd62 100644 --- a/mods/ts/rules/gdi-structures.yaml +++ b/mods/ts/rules/gdi-structures.yaml @@ -281,7 +281,7 @@ GARADR: ProvidesRadar: InfiltrateForExploration: DetectCloaked: - Range: 10 + Range: 10c0 RenderDetectionCircle: RevealsShroud: Range: 10c0 diff --git a/mods/ts/rules/misc.yaml b/mods/ts/rules/misc.yaml index 5a00af3254..33276279d9 100644 --- a/mods/ts/rules/misc.yaml +++ b/mods/ts/rules/misc.yaml @@ -41,7 +41,7 @@ CAMERA: Range: 10c0 Type: CenterPosition DetectCloaked: - Range: 10 + Range: 10c0 CRATE: Inherits: ^Crate diff --git a/mods/ts/rules/nod-structures.yaml b/mods/ts/rules/nod-structures.yaml index 7ed141a510..7437004358 100644 --- a/mods/ts/rules/nod-structures.yaml +++ b/mods/ts/rules/nod-structures.yaml @@ -236,7 +236,7 @@ NARADR: ProvidesRadar: InfiltrateForExploration: DetectCloaked: - Range: 10 + Range: 10c0 RenderDetectionCircle: RevealsShroud: Range: 10c0 diff --git a/mods/ts/rules/nod-support.yaml b/mods/ts/rules/nod-support.yaml index 47b8a19d48..260afeae71 100644 --- a/mods/ts/rules/nod-support.yaml +++ b/mods/ts/rules/nod-support.yaml @@ -46,7 +46,7 @@ NALASR: RevealsShroud: Range: 5c0 DetectCloaked: - Range: 3 + Range: 3c0 Turreted: ROT: 10 InitialFacing: 300 diff --git a/mods/ts/rules/shared-support.yaml b/mods/ts/rules/shared-support.yaml index 58a58593bb..2b53aa6031 100644 --- a/mods/ts/rules/shared-support.yaml +++ b/mods/ts/rules/shared-support.yaml @@ -22,7 +22,7 @@ GADPSA: -RenderRangeCircle: RenderDetectionCircle: DetectCloaked: - Range: 6 + Range: 6c0 NAPULS: Inherits: ^Defense