From cf3cc43a2842330a87e139f058d6928d8694c201 Mon Sep 17 00:00:00 2001 From: Chicken man Date: Thu, 20 Feb 2014 17:37:18 -0500 Subject: [PATCH 1/4] Changed things to do with Shroud to WRange. Updated Utility. --- OpenRA.FileFormats/WRange.cs | 4 ++- OpenRA.Game/Traits/CreatesShroud.cs | 4 +-- OpenRA.Game/Traits/RevealsShroud.cs | 4 +-- OpenRA.Game/Traits/World/Shroud.cs | 35 +++++++++------------ OpenRA.Mods.RA/ActorExts.cs | 4 +-- OpenRA.Mods.RA/MPStartLocations.cs | 2 +- OpenRA.Mods.RA/Missions/Allies02Script.cs | 8 ++--- OpenRA.Mods.RA/Missions/Survival01Script.cs | 4 +-- OpenRA.Mods.RA/Player/PlayerStatistics.cs | 2 +- OpenRA.Mods.RA/RenderShroudCircle.cs | 4 +-- OpenRA.Utility/UpgradeRules.cs | 10 ++++++ 11 files changed, 44 insertions(+), 37 deletions(-) diff --git a/OpenRA.FileFormats/WRange.cs b/OpenRA.FileFormats/WRange.cs index 1275376d4e..2b4952775f 100644 --- a/OpenRA.FileFormats/WRange.cs +++ b/OpenRA.FileFormats/WRange.cs @@ -16,7 +16,7 @@ namespace OpenRA /// /// 1d world distance - 1024 units = 1 cell. /// - public struct WRange : IComparable + public struct WRange : IComparable, IComparable { public readonly int Range; @@ -92,6 +92,8 @@ namespace OpenRA return Range.CompareTo(o.Value.Range); } + public int CompareTo(WRange other) { return Range.CompareTo(other.Range); } + public override string ToString() { return "{0}".F(Range); } } } diff --git a/OpenRA.Game/Traits/CreatesShroud.cs b/OpenRA.Game/Traits/CreatesShroud.cs index ef78d9a0b7..f148a333fc 100644 --- a/OpenRA.Game/Traits/CreatesShroud.cs +++ b/OpenRA.Game/Traits/CreatesShroud.cs @@ -14,7 +14,7 @@ namespace OpenRA.Traits { public class CreatesShroudInfo : ITraitInfo { - public readonly int Range = 0; + public readonly WRange Range = WRange.Zero; public object Create(ActorInitializer init) { return new CreatesShroud(this); } } @@ -43,6 +43,6 @@ namespace OpenRA.Traits } } - public int Range { get { return cachedDisabled ? 0 : Info.Range; } } + public WRange Range { get { return cachedDisabled ? WRange.Zero : Info.Range; } } } } \ No newline at end of file diff --git a/OpenRA.Game/Traits/RevealsShroud.cs b/OpenRA.Game/Traits/RevealsShroud.cs index c8fb7e7e99..74bae01aec 100644 --- a/OpenRA.Game/Traits/RevealsShroud.cs +++ b/OpenRA.Game/Traits/RevealsShroud.cs @@ -14,7 +14,7 @@ namespace OpenRA.Traits { public class RevealsShroudInfo : ITraitInfo { - public readonly int Range = 0; + public readonly WRange Range = WRange.Zero; public object Create(ActorInitializer init) { return new RevealsShroud(this); } } @@ -39,6 +39,6 @@ namespace OpenRA.Traits } } - public int Range { get { return Info.Range; } } + public WRange Range { get { return Info.Range; } } } } diff --git a/OpenRA.Game/Traits/World/Shroud.cs b/OpenRA.Game/Traits/World/Shroud.cs index cf86cfa312..30e71b7bfa 100644 --- a/OpenRA.Game/Traits/World/Shroud.cs +++ b/OpenRA.Game/Traits/World/Shroud.cs @@ -64,32 +64,24 @@ namespace OpenRA.Traits Hash = Sync.hash_player(self.Owner) + self.World.FrameNumber * 3; } - static IEnumerable FindVisibleTiles(World world, CPos a, int r) + static IEnumerable FindVisibleTiles(World world, CPos position, WRange radius) { - var min = a - new CVec(r, r); - var max = a + new CVec(r, r); - if (min.X < world.Map.Bounds.Left - 1) - min = new CPos(world.Map.Bounds.Left - 1, min.Y); - - if (min.Y < world.Map.Bounds.Top - 1) - min = new CPos(min.X, world.Map.Bounds.Top - 1); - - if (max.X > world.Map.Bounds.Right) - max = new CPos(world.Map.Bounds.Right, max.Y); - - if (max.Y > world.Map.Bounds.Bottom) - max = new CPos(max.X, world.Map.Bounds.Bottom); + var r = (radius.Range + 1023) / 1024; + var min = (position - new CVec(r, r)).Clamp(world.Map.Bounds); + var max = (position + new CVec(r, r)).Clamp(world.Map.Bounds); + var circleArea = radius.Range * radius.Range; + var pos = position.CenterPosition; for (var j = min.Y; j <= max.Y; j++) for (var i = min.X; i <= max.X; i++) - if (r*r >= (new CPos(i, j) - a).LengthSquared) + if (circleArea >= (new CPos(i, j).CenterPosition - pos).LengthSquared) yield return new CPos(i, j); } void AddVisibility(Actor a) { var rs = a.TraitOrDefault(); - if (rs == null || !a.Owner.IsAlliedWith(self.Owner) || rs.Range == 0) + if (rs == null || !a.Owner.IsAlliedWith(self.Owner) || rs.Range == WRange.Zero) return; var origins = GetVisOrigins(a); @@ -97,9 +89,11 @@ namespace OpenRA.Traits .Distinct().ToArray(); // Update bounding rect + var r = (rs.Range.Range + 1023) / 1024; + foreach (var o in origins) { - var box = new Rectangle(o.X - rs.Range, o.Y - rs.Range, 2*rs.Range + 1, 2*rs.Range + 1); + var box = new Rectangle(o.X - r, o.Y - r, 2 * r + 1, 2 * r + 1); ExploredBounds = Rectangle.Union(ExploredBounds, box); } @@ -143,7 +137,7 @@ namespace OpenRA.Traits void AddShroudGeneration(Actor a) { var cs = a.TraitOrDefault(); - if (cs == null || a.Owner.IsAlliedWith(self.Owner) || cs.Range == 0) + if (cs == null || a.Owner.IsAlliedWith(self.Owner) || cs.Range == WRange.Zero) return; var shrouded = GetVisOrigins(a).SelectMany(o => FindVisibleTiles(a.World, o, cs.Range)) @@ -202,12 +196,13 @@ namespace OpenRA.Traits return new[] { a.CenterPosition.ToCPos() }; } - public void Explore(World world, CPos center, int range) + public void Explore(World world, CPos center, WRange range) { foreach (var q in FindVisibleTiles(world, center, range)) explored[q.X, q.Y] = true; - var box = new Rectangle(center.X - range, center.Y - range, 2*range + 1, 2*range + 1); + var r = (range.Range + 1023) / 1024; + var box = new Rectangle(center.X - r, center.Y - r, 2 * r + 1, 2 * r + 1); ExploredBounds = Rectangle.Union(ExploredBounds, box); Invalidate(); diff --git a/OpenRA.Mods.RA/ActorExts.cs b/OpenRA.Mods.RA/ActorExts.cs index 33ff923b62..360bfca05a 100644 --- a/OpenRA.Mods.RA/ActorExts.cs +++ b/OpenRA.Mods.RA/ActorExts.cs @@ -75,9 +75,9 @@ namespace OpenRA.Mods.RA { // Move within sight range of the frozen actor var sight = self.TraitOrDefault(); - var range = sight != null ? sight.Range : 2; + var range = sight != null ? sight.Range : WRange.FromCells(2); - self.QueueActivity(move.MoveWithinRange(Target.FromPos(frozen.CenterPosition), WRange.FromCells(range))); + self.QueueActivity(move.MoveWithinRange(Target.FromPos(frozen.CenterPosition), range)); } return Target.Invalid; diff --git a/OpenRA.Mods.RA/MPStartLocations.cs b/OpenRA.Mods.RA/MPStartLocations.cs index b85d0dbfe5..e2f8c15a4f 100755 --- a/OpenRA.Mods.RA/MPStartLocations.cs +++ b/OpenRA.Mods.RA/MPStartLocations.cs @@ -19,7 +19,7 @@ namespace OpenRA.Mods.RA { public class MPStartLocationsInfo : TraitInfo { - public readonly int InitialExploreRange = 5; + public readonly WRange InitialExploreRange = WRange.FromCells(5); } public class MPStartLocations : IWorldLoaded diff --git a/OpenRA.Mods.RA/Missions/Allies02Script.cs b/OpenRA.Mods.RA/Missions/Allies02Script.cs index 4bf15e537a..ee017320c4 100644 --- a/OpenRA.Mods.RA/Missions/Allies02Script.cs +++ b/OpenRA.Mods.RA/Missions/Allies02Script.cs @@ -462,10 +462,10 @@ namespace OpenRA.Mods.RA.Missions SetupAlliedBase(); var shroud = allies1.Shroud; - shroud.Explore(w, sam1.Location, 2); - shroud.Explore(w, sam2.Location, 2); - shroud.Explore(w, sam3.Location, 2); - shroud.Explore(w, sam4.Location, 2); + shroud.Explore(w, sam1.Location, WRange.FromCells(2)); + shroud.Explore(w, sam2.Location, WRange.FromCells(2)); + shroud.Explore(w, sam3.Location, WRange.FromCells(2)); + shroud.Explore(w, sam4.Location, WRange.FromCells(2)); if (w.LocalPlayer == null || w.LocalPlayer == allies1) wr.Viewport.Center(chinookHusk.CenterPosition); diff --git a/OpenRA.Mods.RA/Missions/Survival01Script.cs b/OpenRA.Mods.RA/Missions/Survival01Script.cs index 52a33c97be..4d7b0e0d16 100644 --- a/OpenRA.Mods.RA/Missions/Survival01Script.cs +++ b/OpenRA.Mods.RA/Missions/Survival01Script.cs @@ -333,8 +333,8 @@ namespace OpenRA.Mods.RA.Missions sam2 = actors["Sam2"]; var shroud = allies.PlayerActor.Trait(); - shroud.Explore(w, sam1.Location, 4); - shroud.Explore(w, sam2.Location, 4); + shroud.Explore(w, sam1.Location, WRange.FromCells(4)); + shroud.Explore(w, sam2.Location, WRange.FromCells(4)); wr.Viewport.Center(alliesbase.CenterPosition); StartCountDownTimer(); diff --git a/OpenRA.Mods.RA/Player/PlayerStatistics.cs b/OpenRA.Mods.RA/Player/PlayerStatistics.cs index 845663e366..5779954e5f 100644 --- a/OpenRA.Mods.RA/Player/PlayerStatistics.cs +++ b/OpenRA.Mods.RA/Player/PlayerStatistics.cs @@ -58,7 +58,7 @@ namespace OpenRA.Mods.RA var total = (double)world.Map.Bounds.Width * world.Map.Bounds.Height; MapControl = world.Actors .Where(a => !a.IsDead() && a.IsInWorld && a.Owner == player && a.HasTrait()) - .SelectMany(a => world.FindTilesInCircle(a.Location, a.Trait().Range.Clamp(0, 50))) + .SelectMany(a => world.FindTilesInCircle(a.Location, a.Trait().Range.Clamp(WRange.Zero, WRange.FromCells(50)).Range / 1024)) .Distinct() .Count() / total; } diff --git a/OpenRA.Mods.RA/RenderShroudCircle.cs b/OpenRA.Mods.RA/RenderShroudCircle.cs index cfc2868c90..58e7e787a5 100644 --- a/OpenRA.Mods.RA/RenderShroudCircle.cs +++ b/OpenRA.Mods.RA/RenderShroudCircle.cs @@ -20,7 +20,7 @@ namespace OpenRA.Mods.RA { wr.DrawRangeCircleWithContrast( centerPosition, - WRange.FromCells(ai.Traits.Get().Range), + ai.Traits.Get().Range, Color.FromArgb(128, Color.Cyan), Color.FromArgb(96, Color.Black) ); @@ -46,7 +46,7 @@ namespace OpenRA.Mods.RA wr.DrawRangeCircleWithContrast( self.CenterPosition, - WRange.FromCells(self.Info.Traits.Get().Range), + self.Info.Traits.Get().Range, Color.FromArgb(128, Color.Cyan), Color.FromArgb(96, Color.Black) ); diff --git a/OpenRA.Utility/UpgradeRules.cs b/OpenRA.Utility/UpgradeRules.cs index c6d8a06eb8..4dbc29fae2 100644 --- a/OpenRA.Utility/UpgradeRules.cs +++ b/OpenRA.Utility/UpgradeRules.cs @@ -120,6 +120,16 @@ namespace OpenRA.Utility node.Value.Nodes.RemoveAll(n => n.Key == "UnloadFacing"); } + // RevealShroud was updated to use world units. + if (engineVersion < 20140220) + { + if (depth == 2 && parentKey == "RevealsShroud" && node.Key == "Range") + ConvertFloatToRange(ref node.Value.Value); + + if (depth == 2 && parentKey == "CreatesShroud" && node.Key == "Range") + ConvertFloatToRange(ref node.Value.Value); + } + UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1); } } From efb718a109cd9f6bb87b1482ce32d8be229c2192 Mon Sep 17 00:00:00 2001 From: Chicken man Date: Mon, 24 Feb 2014 15:35:47 -0500 Subject: [PATCH 2/4] Updated CHANGELOG --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 5ebe6adad8..1140b289b5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -88,6 +88,7 @@ NEW: Added RenderNameTag trait to show the player's name above an actor. Fixed performance issues with units pathing to naval transports. Fixed unit moving to transports that have moved. + Updated shroud-based traits to use world units. Server: Message of the day is now shared between all mods and a default motd.txt gets created in the user directory. Asset Browser: @@ -97,6 +98,7 @@ NEW: Fixed being unable to use the flood fill tool on similar grass/snow/desert tiles. Utility: Added an improved INI/MPR map import. + Added an --upgrade-mod feature to upgrade the yaml of mods to the latest specifications. Mod / Custom map compatibility: Altitude is no longer parsed from actor templates in maps. Specify CenterPosition instead. system.yaml has been split into four files for all mods: system-actor.yaml, system-ai.yaml, system-player.yaml and system-world.yaml. From 718ddf9afd006593f1f423dca318d7fc80e08058 Mon Sep 17 00:00:00 2001 From: Chicken man Date: Tue, 4 Mar 2014 21:04:38 -0500 Subject: [PATCH 3/4] Updated mods to work with changes. --- mods/cnc/rules/aircraft.yaml | 12 +++--- mods/cnc/rules/civilian.yaml | 2 +- mods/cnc/rules/defaults.yaml | 8 ++-- mods/cnc/rules/husks.yaml | 1 + mods/cnc/rules/infantry.yaml | 2 +- mods/cnc/rules/ships.yaml | 5 ++- mods/cnc/rules/structures.yaml | 38 ++++++++--------- mods/cnc/rules/system-actors.yaml | 3 +- mods/cnc/rules/system-world.yaml | 1 + mods/cnc/rules/vehicles.yaml | 30 +++++++------- mods/d2k/rules/aircraft.yaml | 8 ++-- mods/d2k/rules/atreides.yaml | 6 +-- mods/d2k/rules/defaults.yaml | 2 +- mods/d2k/rules/harkonnen.yaml | 4 +- mods/d2k/rules/infantry.yaml | 1 + mods/d2k/rules/ordos.yaml | 11 ++--- mods/d2k/rules/structures.yaml | 32 +++++++-------- mods/d2k/rules/system-player.yaml | 1 + mods/d2k/rules/system-world.yaml | 1 + mods/d2k/rules/vehicles.yaml | 14 +++---- mods/ra/rules/aircraft.yaml | 11 ++--- mods/ra/rules/civilian.yaml | 10 ++--- mods/ra/rules/defaults.yaml | 4 +- mods/ra/rules/husks.yaml | 10 ++--- mods/ra/rules/infantry.yaml | 20 ++++----- mods/ra/rules/ships.yaml | 12 +++--- mods/ra/rules/structures.yaml | 68 +++++++++++++++---------------- mods/ra/rules/system-actors.yaml | 4 +- mods/ra/rules/system-world.yaml | 1 + mods/ra/rules/vehicles.yaml | 43 +++++++++---------- mods/ts/rules/aircraft.yaml | 16 ++++---- mods/ts/rules/defaults.yaml | 4 +- mods/ts/rules/infantry.yaml | 32 +++++++-------- mods/ts/rules/structures.yaml | 28 ++++++------- mods/ts/rules/system-player.yaml | 1 + mods/ts/rules/system-world.yaml | 3 +- mods/ts/rules/vehicles.yaml | 52 +++++++++++------------ 37 files changed, 257 insertions(+), 244 deletions(-) diff --git a/mods/cnc/rules/aircraft.yaml b/mods/cnc/rules/aircraft.yaml index 4bacb26cbb..d6400d3a5b 100644 --- a/mods/cnc/rules/aircraft.yaml +++ b/mods/cnc/rules/aircraft.yaml @@ -22,7 +22,7 @@ TRAN: Armor: Type: Light RevealsShroud: - Range: 8 + Range: 8c0 RenderUnit: WithRotor@PRIMARY: Offset: -597,0,171 @@ -62,7 +62,7 @@ HELI: Armor: Type: Light RevealsShroud: - Range: 10 + Range: 10c0 Armament@PRIMARY: Weapon: HeliAGGun LocalOffset: 128,-213,-85, 128,213,-85 @@ -114,7 +114,7 @@ ORCA: Armor: Type: Light RevealsShroud: - Range: 10 + Range: 10c0 Armament@PRIMARY: Weapon: OrcaAGMissiles LocalOffset: 427,-171,-213, 427,171,-213 @@ -226,7 +226,7 @@ TRAN.Husk: ROT: 5 Speed: 140 RevealsShroud: - Range: 8 + Range: 8c0 WithRotor@PRIMARY: Offset: -597,0,171 WithRotor@SECONDARY: @@ -244,7 +244,7 @@ HELI.Husk: ROT: 4 Speed: 186 RevealsShroud: - Range: 10 + Range: 10c0 WithRotor: Offset: 0,0,85 RenderUnit: @@ -259,7 +259,7 @@ ORCA.Husk: ROT: 4 Speed: 186 RevealsShroud: - Range: 10 + Range: 10c0 RenderUnit: Image: orca WithShadow: diff --git a/mods/cnc/rules/civilian.yaml b/mods/cnc/rules/civilian.yaml index f60278818a..ec29780a03 100644 --- a/mods/cnc/rules/civilian.yaml +++ b/mods/cnc/rules/civilian.yaml @@ -415,7 +415,7 @@ VICE: Armor: Type: Wood RevealsShroud: - Range: 6 + Range: 6c0 Mobile: Speed: 71 TerrainSpeeds: diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 89ef05f923..e0cf4e9851 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -130,7 +130,7 @@ Armor: Type: None RevealsShroud: - Range: 5 + Range: 5c0 AutoTarget: ScanRadius: 4 Mobile: @@ -202,7 +202,7 @@ Health: HP: 25 RevealsShroud: - Range: 2 + Range: 2c0 Armament: Weapon: Pistol AttackFrontal: @@ -229,7 +229,7 @@ Tooltip: Name: Dinosaur RevealsShroud: - Range: 6 + Range: 6c0 Mobile: Crushes: crate Speed: 113 @@ -400,7 +400,7 @@ RepairableBuilding: EngineerRepairable: RevealsShroud: - Range: 3 + Range: 3c0 ^CivField: Inherits: ^CivBuilding diff --git a/mods/cnc/rules/husks.yaml b/mods/cnc/rules/husks.yaml index d88c2ab10c..f6ddd4ade9 100644 --- a/mods/cnc/rules/husks.yaml +++ b/mods/cnc/rules/husks.yaml @@ -147,3 +147,4 @@ STNK.Husk: Image: stnk TransformOnCapture: IntoActor: stnk + diff --git a/mods/cnc/rules/infantry.yaml b/mods/cnc/rules/infantry.yaml index 734c133f3d..2b463cdf7b 100644 --- a/mods/cnc/rules/infantry.yaml +++ b/mods/cnc/rules/infantry.yaml @@ -197,7 +197,7 @@ RMBO: Passenger: PipType: Red RevealsShroud: - Range: 6 + Range: 6c0 AutoTarget: ScanRadius: 5 C4Demolition: diff --git a/mods/cnc/rules/ships.yaml b/mods/cnc/rules/ships.yaml index 745cd909c2..313d992b2d 100644 --- a/mods/cnc/rules/ships.yaml +++ b/mods/cnc/rules/ships.yaml @@ -14,7 +14,7 @@ BOAT: Speed: 28 OnRails: true RevealsShroud: - Range: 7 + Range: 7c0 Turreted: ROT: 7 Offset: 640,0,171 @@ -59,7 +59,7 @@ LST: Armor: Type: Heavy RevealsShroud: - Range: 7 + Range: 7c0 RenderUnit: WithRoof: WithCargo: @@ -69,3 +69,4 @@ LST: Types: Infantry, Vehicle MaxWeight: 5 PipCount: 5 + diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml index 8458c9e4ed..e4c0363784 100644 --- a/mods/cnc/rules/structures.yaml +++ b/mods/cnc/rules/structures.yaml @@ -18,7 +18,7 @@ FACT: Armor: Type: Wood RevealsShroud: - Range: 10 + Range: 10c0 Bib: Production: Produces: Building,Defense @@ -66,7 +66,7 @@ NUKE: Health: HP: 400 RevealsShroud: - Range: 4 + Range: 4c0 Bib: NUK2: @@ -89,7 +89,7 @@ NUK2: Health: HP: 650 RevealsShroud: - Range: 4 + Range: 4c0 Bib: PROC: @@ -110,7 +110,7 @@ PROC: Health: HP: 900 RevealsShroud: - Range: 6 + Range: 6c0 Bib: TiberiumRefinery: DockOffset: 0,2 @@ -150,7 +150,7 @@ SILO: Health: HP: 400 RevealsShroud: - Range: 4 + Range: 4c0 RenderBuildingSilo: StoresOre: PipCount: 10 @@ -181,7 +181,7 @@ PYLE: Health: HP: 500 RevealsShroud: - Range: 5 + Range: 5c0 Bib: RallyPoint: Exit@1: @@ -219,7 +219,7 @@ HAND: Health: HP: 500 RevealsShroud: - Range: 5 + Range: 5c0 Bib: RallyPoint: Exit@1: @@ -254,7 +254,7 @@ AFLD: Health: HP: 1000 RevealsShroud: - Range: 7 + Range: 7c0 Bib: RallyPoint: RallyPoint: 4,2 @@ -291,7 +291,7 @@ WEAP: Health: HP: 1000 RevealsShroud: - Range: 4 + Range: 4c0 Bib: -RenderBuilding: RenderBuildingWarFactory: @@ -327,7 +327,7 @@ HPAD: Health: HP: 400 RevealsShroud: - Range: 5 + Range: 5c0 Exit@1: SpawnOffset: 0,-256,0 Production: @@ -365,7 +365,7 @@ HQ: Health: HP: 750 RevealsShroud: - Range: 10 + Range: 10c0 Bib: ProvidesRadar: RenderDetectionCircle: @@ -403,7 +403,7 @@ FIX: Health: HP: 400 RevealsShroud: - Range: 5 + Range: 5c0 Reservable: RepairsUnits: RallyPoint: @@ -431,7 +431,7 @@ EYE: Health: HP: 1200 RevealsShroud: - Range: 10 + Range: 10c0 Bib: ProvidesRadar: RenderDetectionCircle: @@ -474,7 +474,7 @@ TMPL: Health: HP: 2000 RevealsShroud: - Range: 6 + Range: 6c0 Bib: NukePower: Icon: abomb @@ -512,7 +512,7 @@ GUN: Health: HP: 400 RevealsShroud: - Range: 6 + Range: 6c0 Turreted: ROT: 12 InitialFacing: 50 @@ -555,7 +555,7 @@ SAM: Armor: Type: Heavy RevealsShroud: - Range: 5 + Range: 5c0 Turreted: ROT: 10 InitialFacing: 0 @@ -593,7 +593,7 @@ OBLI: Armor: Type: Heavy RevealsShroud: - Range: 7 + Range: 7c0 RenderBuildingCharge: ChargeAudio: obelpowr.aud Armament: @@ -631,7 +631,7 @@ GTWR: Health: HP: 400 RevealsShroud: - Range: 6 + Range: 6c0 Armament: Weapon: HighV LocalOffset: 256,0,256 @@ -672,7 +672,7 @@ ATWR: Armor: Type: Heavy RevealsShroud: - Range: 7 + Range: 7c0 Turreted: ROT: 255 Offset: 128,128,-85 diff --git a/mods/cnc/rules/system-actors.yaml b/mods/cnc/rules/system-actors.yaml index 10ee6f00a0..467150a1bd 100644 --- a/mods/cnc/rules/system-actors.yaml +++ b/mods/cnc/rules/system-actors.yaml @@ -39,12 +39,13 @@ waypoint: Waypoint: RenderEditorOnly: BodyOrientation: + CAMERA: Aircraft: Health: HP: 1000 RevealsShroud: - Range: 10 + Range: 10c0 ProximityCaptor: Types: Camera BodyOrientation: diff --git a/mods/cnc/rules/system-world.yaml b/mods/cnc/rules/system-world.yaml index c4e96ebc5e..b0441c6e26 100644 --- a/mods/cnc/rules/system-world.yaml +++ b/mods/cnc/rules/system-world.yaml @@ -176,3 +176,4 @@ World: ConquestObjectivesPanel: ObjectivesPanel: CONQUEST_OBJECTIVES RadarPings: + diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml index 2b0e4a661e..4d603697e4 100644 --- a/mods/cnc/rules/vehicles.yaml +++ b/mods/cnc/rules/vehicles.yaml @@ -18,7 +18,7 @@ MCV: Armor: Type: Light RevealsShroud: - Range: 8 + Range: 8c0 Transforms: IntoActor: fact Offset: -1,-1 @@ -65,7 +65,7 @@ HARV: Armor: Type: Heavy RevealsShroud: - Range: 4 + Range: 4c0 LeavesHusk: HuskActor: HARV.Husk -GainsExperience: @@ -90,7 +90,7 @@ APC: Armor: Type: Heavy RevealsShroud: - Range: 7 + Range: 7c0 Turreted: ROT: 10 Armament@PRIMARY: @@ -137,7 +137,7 @@ ARTY: Armor: Type: Light RevealsShroud: - Range: 9 + Range: 9c0 Armament: Weapon: ArtilleryShell LocalOffset: 624,0,208 @@ -171,7 +171,7 @@ FTNK: Armor: Type: Light RevealsShroud: - Range: 5 + Range: 5c0 Armament: Weapon: BigFlamer LocalOffset: 512,128,42, 512,-128,42 @@ -205,7 +205,7 @@ BGGY: Armor: Type: Light RevealsShroud: - Range: 7 + Range: 7c0 Turreted: ROT: 10 Offset: -43,0,128 @@ -246,7 +246,7 @@ BIKE: Armor: Type: Light RevealsShroud: - Range: 8 + Range: 8c0 Armament: Weapon: BikeRockets LocalOffset: -128, -170, 170, -128, 170, 170 @@ -276,7 +276,7 @@ JEEP: Armor: Type: Light RevealsShroud: - Range: 8 + Range: 8c0 Turreted: ROT: 10 Offset: -85,0,128 @@ -310,7 +310,7 @@ LTNK: Armor: Type: Heavy RevealsShroud: - Range: 6 + Range: 6c0 Turreted: ROT: 5 Armament: @@ -347,7 +347,7 @@ MTNK: Armor: Type: Heavy RevealsShroud: - Range: 6 + Range: 6c0 Turreted: ROT: 5 Armament: @@ -388,7 +388,7 @@ HTNK: Armor: Type: Heavy RevealsShroud: - Range: 6 + Range: 6c0 Turreted: ROT: 3 Armament@PRIMARY: @@ -438,7 +438,7 @@ MSAM: Armor: Type: Light RevealsShroud: - Range: 10 + Range: 10c0 Turreted: ROT: 255 Offset: -256,0,128 @@ -475,7 +475,7 @@ MLRS: Armor: Type: Light RevealsShroud: - Range: 10 + Range: 10c0 Turreted: ROT: 8 Offset: -128,0,128 @@ -516,7 +516,7 @@ STNK: Armor: Type: Light RevealsShroud: - Range: 7 + Range: 7c0 Cloak: RequiresCrate: false InitialDelay: 90 @@ -548,7 +548,7 @@ MHQ: Mobile: Speed: 85 RevealsShroud: - Range: 6 + Range: 6c0 RenderUnit: WithIdleOverlay@SPINNER: Sequence: spinner diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml index c6c8218341..13a5455f41 100644 --- a/mods/d2k/rules/aircraft.yaml +++ b/mods/d2k/rules/aircraft.yaml @@ -10,7 +10,7 @@ Armor: Type: Light RevealsShroud: - Range: 12 + Range: 12c0 Helicopter: InitialFacing: 0 ROT: 4 @@ -72,7 +72,7 @@ ORNI: Armor: Type: Light RevealsShroud: - Range: 10 + Range: 10c0 Armament: Weapon: ChainGun LocalOffset: 85,-213,-85 @@ -102,7 +102,7 @@ ORNI.bomber: Armor: Type: Light RevealsShroud: - Range: 10 + Range: 10c0 Plane: ROT: 5 Speed: 350 @@ -131,7 +131,7 @@ CARRYALL.infantry: Armor: Type: Light RevealsShroud: - Range: 12 + Range: 12c0 Plane: ROT: 4 Speed: 280 diff --git a/mods/d2k/rules/atreides.yaml b/mods/d2k/rules/atreides.yaml index ff188b7bc8..6c98002bc2 100644 --- a/mods/d2k/rules/atreides.yaml +++ b/mods/d2k/rules/atreides.yaml @@ -128,7 +128,7 @@ COMBATA: Buildable: Owner: atreides RevealsShroud: - Range: 8 + Range: 8c0 Turreted: ROT: 6 Armament: @@ -180,7 +180,7 @@ SONICTANK: ROT: 3 Speed: 74 RevealsShroud: - Range: 6 + Range: 6c0 RenderUnit: Image: SONICTANK Armament: @@ -223,7 +223,7 @@ FREMEN: HP: 70 Passenger: RevealsShroud: - Range: 7 + Range: 7c0 AutoTarget: ScanRadius: 7 Armament@PRIMARY: diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml index fef72a5fb7..ebebf2ec35 100644 --- a/mods/d2k/rules/defaults.yaml +++ b/mods/d2k/rules/defaults.yaml @@ -144,7 +144,7 @@ Armor: Type: None RevealsShroud: - Range: 6 + Range: 6c0 Mobile: Crushes: crate SharesCell: true diff --git a/mods/d2k/rules/harkonnen.yaml b/mods/d2k/rules/harkonnen.yaml index 8e336e5cfa..a4f692b107 100644 --- a/mods/d2k/rules/harkonnen.yaml +++ b/mods/d2k/rules/harkonnen.yaml @@ -185,7 +185,7 @@ DEVAST: Speed: 42 Crushes: crate, infantry RevealsShroud: - Range: 7 + Range: 7c0 RenderUnit: Armament: Weapon: DevBullet @@ -231,7 +231,7 @@ SARDAUKAR: Mobile: Speed: 42 RevealsShroud: - Range: 6 + Range: 6c0 TakeCover: -RenderInfantry: RenderInfantryProne: diff --git a/mods/d2k/rules/infantry.yaml b/mods/d2k/rules/infantry.yaml index 8ee629fb7c..e02de84e45 100644 --- a/mods/d2k/rules/infantry.yaml +++ b/mods/d2k/rules/infantry.yaml @@ -109,3 +109,4 @@ MEDIC: Passenger: PipType: Blue -AutoTarget: + diff --git a/mods/d2k/rules/ordos.yaml b/mods/d2k/rules/ordos.yaml index 59112f1395..c414e0b203 100644 --- a/mods/d2k/rules/ordos.yaml +++ b/mods/d2k/rules/ordos.yaml @@ -118,7 +118,7 @@ COMBATO: Buildable: Owner: ordos RevealsShroud: - Range: 8 + Range: 8c0 Turreted: ROT: 8 Mobile: @@ -167,7 +167,7 @@ RAIDER: ROT: 10 Speed: 149 RevealsShroud: - Range: 7 + Range: 7c0 RenderUnit: WithMuzzleFlash: Armament: @@ -201,7 +201,7 @@ STEALTHRAIDER: ROT: 10 Speed: 149 RevealsShroud: - Range: 7 + Range: 7c0 RenderUnit: WithMuzzleFlash: Armament: @@ -250,7 +250,7 @@ DEVIATORTANK: Armor: Type: Light RevealsShroud: - Range: 5 + Range: 5c0 RenderUnit: Armament: Weapon: FakeMissile @@ -294,7 +294,8 @@ SABOTEUR: Mobile: Speed: 64 RevealsShroud: - Range: 7 + Range: 7c0 C4Demolition: C4Delay: 45 -AutoTarget: + diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index eaf3aa40a6..5d3ecb80f3 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -17,7 +17,7 @@ Armor: Type: Concrete RevealsShroud: - Range: 10 + Range: 10c0 Production: Produces: Building Valued: @@ -55,7 +55,7 @@ Armor: Type: Wood RevealsShroud: - Range: 4 + Range: 4c0 ProvidesCustomPrerequisite: Prerequisite: Power WithIdleOverlay@ZAPS: @@ -85,7 +85,7 @@ Armor: Type: Wood RevealsShroud: - Range: 5 + Range: 5c0 RallyPoint: RallyPoint: 1,3 Exit@1: @@ -127,7 +127,7 @@ Armor: Type: Wood RevealsShroud: - Range: 6 + Range: 6c0 -RenderBuilding: OreRefinery: DockOffset: 2,1 @@ -170,7 +170,7 @@ Armor: Type: Wood RevealsShroud: - Range: 4 + Range: 4c0 -RenderBuilding: RenderBuildingSilo: StoresOre: @@ -203,7 +203,7 @@ Armor: Type: Wood RevealsShroud: - Range: 4 + Range: 4c0 -RenderBuilding: RallyPoint: RallyPoint: 2,2 @@ -243,7 +243,7 @@ Armor: Type: Wood RevealsShroud: - Range: 4 + Range: 4c0 -RenderBuilding: RallyPoint: RallyPoint: 0,3 @@ -286,7 +286,7 @@ Armor: Type: Wood RevealsShroud: - Range: 10 + Range: 10c0 ProvidesRadar: DetectCloaked: Range: 6 @@ -320,7 +320,7 @@ Armor: Type: Wood RevealsShroud: - Range: 7 + Range: 7c0 RallyPoint: RallyPoint: 1,3 Exit@1: @@ -415,7 +415,7 @@ WALL: Armor: Type: Concrete RevealsShroud: - Range: 8 + Range: 8c0 RenderRangeCircle: RenderBuilding: HasMakeAnimation: false @@ -462,7 +462,7 @@ WALL: Armor: Type: Concrete RevealsShroud: - Range: 10 + Range: 10c0 RenderRangeCircle: RenderBuilding: HasMakeAnimation: false @@ -506,7 +506,7 @@ WALL: Armor: Type: Concrete RevealsShroud: - Range: 5 + Range: 5c0 Reservable: RepairsUnits: Interval: 15 @@ -540,7 +540,7 @@ WALL: Armor: Type: Wood RevealsShroud: - Range: 4 + Range: 4c0 ProvidesCustomPrerequisite: Prerequisite: Hitech WithIdleOverlay@WELDING: @@ -581,7 +581,7 @@ WALL: Armor: Type: Wood RevealsShroud: - Range: 4 + Range: 4c0 ProvidesCustomPrerequisite: Prerequisite: Research WithIdleOverlay@LIGHTS: @@ -611,7 +611,7 @@ WALL: Armor: Type: Wood RevealsShroud: - Range: 8 + Range: 8c0 RenderDetectionCircle: DetectCloaked: Range: 4 @@ -634,7 +634,7 @@ SIETCH: Armor: Type: Concrete RevealsShroud: - Range: 10 + Range: 10c0 -GivesBuildableArea: -Sellable: -ExternalCapturable: diff --git a/mods/d2k/rules/system-player.yaml b/mods/d2k/rules/system-player.yaml index f77b6564f4..c02b59263d 100644 --- a/mods/d2k/rules/system-player.yaml +++ b/mods/d2k/rules/system-player.yaml @@ -52,3 +52,4 @@ Player: HarvesterAttackNotifier: PlayerStatistics: PlaceBeacon: + diff --git a/mods/d2k/rules/system-world.yaml b/mods/d2k/rules/system-world.yaml index 620fdb5b6a..c63fc1c0cb 100644 --- a/mods/d2k/rules/system-world.yaml +++ b/mods/d2k/rules/system-world.yaml @@ -127,3 +127,4 @@ World: ValidateOrder: DebugPauseState: RadarPings: + diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml index 258a8f5765..04946705a5 100644 --- a/mods/d2k/rules/vehicles.yaml +++ b/mods/d2k/rules/vehicles.yaml @@ -21,7 +21,7 @@ Speed: 64 Crushes: crate, infantry RevealsShroud: - Range: 8 + Range: 8c0 MustBeDestroyed: BaseBuilding: Explodes: @@ -75,7 +75,7 @@ HARVESTER: RenderUnit: Image: HARVESTER RevealsShroud: - Range: 4 + Range: 4c0 Explodes: Weapon: UnitExplodeScale EmptyWeapon: UnitExplodeScale @@ -124,7 +124,7 @@ TRIKE: ROT: 10 Speed: 128 RevealsShroud: - Range: 7 + Range: 7c0 RenderUnit: WithMuzzleFlash: Armament: @@ -167,7 +167,7 @@ QUAD: ROT: 8 Speed: 96 RevealsShroud: - Range: 8 + Range: 8c0 Armament: Weapon: QuadRockets LocalOffset: 128,64,64, 128,-64,64 @@ -209,7 +209,7 @@ QUAD.starport: ROT: 6 Crushes: crate, infantry RevealsShroud: - Range: 7 + Range: 7c0 Turreted: ROT: 6 AlignWhenIdle: true @@ -258,7 +258,7 @@ SIEGETANK: ROT: 3 Crushes: crate, infantry RevealsShroud: - Range: 8 + Range: 8c0 Turreted: ROT: 3 Offset: 0,0,-32 @@ -320,7 +320,7 @@ MISSILETANK: Armor: Type: Light RevealsShroud: - Range: 9 + Range: 9c0 RenderUnit: Image: MISSILETANK Armament: diff --git a/mods/ra/rules/aircraft.yaml b/mods/ra/rules/aircraft.yaml index 42af3b6a5a..878d1915a9 100644 --- a/mods/ra/rules/aircraft.yaml +++ b/mods/ra/rules/aircraft.yaml @@ -90,7 +90,7 @@ MIG: Armor: Type: Light RevealsShroud: - Range: 12 + Range: 12c0 Armament: Weapon: Maverick LocalOffset: 0,-640,0, 0,640,0 @@ -143,7 +143,7 @@ YAK: Armor: Type: Light RevealsShroud: - Range: 10 + Range: 10c0 Armament@PRIMARY: Weapon: ChainGun.Yak LocalOffset: 256,-213,0 @@ -200,7 +200,7 @@ TRAN: Armor: Type: Light RevealsShroud: - Range: 12 + Range: 12c0 Helicopter: RearmBuildings: hpad InitialFacing: 0 @@ -240,7 +240,7 @@ HELI: Armor: Type: Light RevealsShroud: - Range: 12 + Range: 12c0 Armament@PRIMARY: Weapon: HellfireAA LocalOffset: 0,-213,-85 @@ -289,7 +289,7 @@ HIND: Armor: Type: Light RevealsShroud: - Range: 10 + Range: 10c0 Armament@PRIMARY: Weapon: ChainGun LocalOffset: 85,-213,-85 @@ -351,3 +351,4 @@ U2: Offset: -1c43,0,0 Interval: 2 RejectsOrders: + diff --git a/mods/ra/rules/civilian.yaml b/mods/ra/rules/civilian.yaml index e0aab116ba..deab3e17e9 100644 --- a/mods/ra/rules/civilian.yaml +++ b/mods/ra/rules/civilian.yaml @@ -67,7 +67,7 @@ FCOM: Tooltip: Name: Forward Command RevealsShroud: - Range: 10 + Range: 10c0 Bib: HOSP: @@ -87,7 +87,7 @@ HOSP: Tooltip: Name: Hospital RevealsShroud: - Range: 3 + Range: 3c0 DeadBuildingState: V01: @@ -98,7 +98,7 @@ V01: Tooltip: Name: Church RevealsShroud: - Range: 10 + Range: 10c0 TransformOnCapture: IntoActor: v01.sniper SkipMakeAnims: true @@ -341,7 +341,7 @@ OILB: Health: HP: 1000 RevealsShroud: - Range: 3 + Range: 3c0 ExternalCapturable: ExternalCapturableBar: EngineerRepairable: @@ -541,7 +541,7 @@ V25: Tooltip: Name: Church RevealsShroud: - Range: 10 + Range: 10c0 TransformOnCapture: IntoActor: v25.sniper SkipMakeAnims: true diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 0087e23a91..c151deed50 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -103,7 +103,7 @@ Armor: Type: None RevealsShroud: - Range: 4 + Range: 4c0 Mobile: Crushes: apmine, crate SharesCell: true @@ -359,7 +359,7 @@ Mobile: Speed: 56 RevealsShroud: - Range: 2 + Range: 2c0 Armament: Weapon: Pistol AttackFrontal: diff --git a/mods/ra/rules/husks.yaml b/mods/ra/rules/husks.yaml index e01d3af9c5..b933402d3d 100644 --- a/mods/ra/rules/husks.yaml +++ b/mods/ra/rules/husks.yaml @@ -97,7 +97,7 @@ TRAN.Husk: Id: rotor_2 Offset: 597,0,213 RevealsShroud: - Range: 12 + Range: 12c0 TRAN.Husk1: Inherits: ^Husk @@ -158,7 +158,7 @@ MIG.Husk: Interval: 2 MinDamage: Undamaged RevealsShroud: - Range: 12 + Range: 12c0 YAK.Husk: Inherits: ^PlaneHusk @@ -178,7 +178,7 @@ YAK.Husk: Interval: 2 MinDamage: Undamaged RevealsShroud: - Range: 10 + Range: 10c0 HELI.Husk: Inherits: ^HelicopterHusk @@ -196,7 +196,7 @@ HELI.Husk: Offset: -427,0,0 MinDamage: Undamaged RevealsShroud: - Range: 12 + Range: 12c0 HIND.Husk: Inherits: ^HelicopterHusk @@ -213,7 +213,7 @@ HIND.Husk: Offset: -427,0,0 MinDamage: Undamaged RevealsShroud: - Range: 10 + Range: 10c0 U2.Husk: Inherits: ^PlaneHusk diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index 11297ee026..722558fe21 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -19,7 +19,7 @@ DOG: Mobile: Speed: 99 RevealsShroud: - Range: 5 + Range: 5c0 Armament: Weapon: DogJaw AttackLeap: @@ -203,7 +203,7 @@ SPY: Mobile: Speed: 56 RevealsShroud: - Range: 5 + Range: 5c0 Passenger: PipType: Yellow TakeCover: @@ -241,7 +241,7 @@ E7: Mobile: Speed: 71 RevealsShroud: - Range: 6 + Range: 6c0 C4Demolition: C4Delay: 45 Passenger: @@ -277,7 +277,7 @@ MEDI: Mobile: Speed: 56 RevealsShroud: - Range: 3 + Range: 3c0 Passenger: PipType: Yellow AutoHeal: @@ -312,7 +312,7 @@ MECH: Mobile: Speed: 56 RevealsShroud: - Range: 3 + Range: 3c0 Passenger: PipType: Yellow AutoHeal: @@ -340,7 +340,7 @@ EINSTEIN: Mobile: Speed: 71 RevealsShroud: - Range: 2 + Range: 2c0 -AutoTarget: ProximityCaptor: Types: CivilianInfantry @@ -362,7 +362,7 @@ DELPHI: Mobile: Speed: 71 RevealsShroud: - Range: 2 + Range: 2c0 -AutoTarget: ProximityCaptor: Types: CivilianInfantry @@ -397,7 +397,7 @@ THF: Mobile: Speed: 56 RevealsShroud: - Range: 5 + Range: 5c0 Passenger: PipType: Yellow Infiltrates: @@ -426,7 +426,7 @@ SHOK: Mobile: Speed: 56 RevealsShroud: - Range: 4 + Range: 4c0 Armament: Weapon: PortaTesla LocalOffset: 427,0,341 @@ -460,7 +460,7 @@ SNIPER: Passenger: PipType: Red RevealsShroud: - Range: 6 + Range: 6c0 AutoTarget: InitialStance: HoldFire Armament: diff --git a/mods/ra/rules/ships.yaml b/mods/ra/rules/ships.yaml index 46b1b5d985..ee8b948283 100644 --- a/mods/ra/rules/ships.yaml +++ b/mods/ra/rules/ships.yaml @@ -19,7 +19,7 @@ SS: ROT: 4 Speed: 71 RevealsShroud: - Range: 6 + Range: 6c0 -TargetableUnit: TargetableSubmarine: TargetTypes: Ground, Water @@ -65,7 +65,7 @@ MSUB: ROT: 3 Speed: 42 RevealsShroud: - Range: 6 + Range: 6c0 RenderUnit: -TargetableUnit: TargetableSubmarine: @@ -111,7 +111,7 @@ DD: ROT: 7 Speed: 85 RevealsShroud: - Range: 6 + Range: 6c0 Turreted: ROT: 7 Offset: 341,0,128 @@ -157,7 +157,7 @@ CA: ROT: 3 Speed: 42 RevealsShroud: - Range: 7 + Range: 7c0 Turreted@PRIMARY: Turret: primary Offset: -864,0,128 @@ -215,7 +215,7 @@ LST: ROT: 10 Speed: 113 RevealsShroud: - Range: 6 + Range: 6c0 RenderLandingCraft: OpenTerrainTypes: Clear, Rough, Road, Ore, Gems, Beach Cargo: @@ -246,7 +246,7 @@ PT: ROT: 7 Speed: 128 RevealsShroud: - Range: 7 + Range: 7c0 Turreted: ROT: 7 Offset: 512,0,0 diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index 9a9dd9cd41..d9224ee343 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -21,7 +21,7 @@ MSLO: Armor: Type: Wood RevealsShroud: - Range: 5 + Range: 5c0 IronCurtainable: NukePower: Icon: abomb @@ -69,9 +69,9 @@ GAP: Armor: Type: Wood RevealsShroud: - Range: 6 + Range: 6c0 CreatesShroud: - Range: 6 + Range: 6c0 IronCurtainable: RenderShroudCircle: @@ -106,7 +106,7 @@ SPEN: Armor: Type: Light RevealsShroud: - Range: 4 + Range: 4c0 Exit@1: SpawnOffset: 0,-213,0 Facing: 96 @@ -163,7 +163,7 @@ SYRD: Armor: Type: Light RevealsShroud: - Range: 4 + Range: 4c0 Exit@1: SpawnOffset: -1024,1024,0 Facing: 160 @@ -217,7 +217,7 @@ IRON: Armor: Type: Wood RevealsShroud: - Range: 10 + Range: 10c0 IronCurtainable: IronCurtainPower: Icon: invuln @@ -258,7 +258,7 @@ PDOX: Armor: Type: Wood RevealsShroud: - Range: 10 + Range: 10c0 IronCurtainable: ChronoshiftPower: Icon: chrono @@ -301,7 +301,7 @@ TSLA: Armor: Type: Heavy RevealsShroud: - Range: 8 + Range: 8c0 RenderBuildingCharge: Armament: Weapon: TeslaZap @@ -341,7 +341,7 @@ AGUN: Armor: Type: Heavy RevealsShroud: - Range: 6 + Range: 6c0 Turreted: ROT: 15 InitialFacing: 224 @@ -384,7 +384,7 @@ DOME: Armor: Type: Wood RevealsShroud: - Range: 10 + Range: 10c0 Bib: ProvidesRadar: IronCurtainable: @@ -406,7 +406,7 @@ PBOX: Armor: Type: Heavy RevealsShroud: - Range: 6 + Range: 6c0 IronCurtainable: -AcceptsSupplies: Turreted: @@ -552,7 +552,7 @@ HBOX: Armor: Type: Heavy RevealsShroud: - Range: 6 + Range: 6c0 Cloak: InitialDelay: 125 CloakDelay: 60 @@ -708,7 +708,7 @@ GUN: Armor: Type: Heavy RevealsShroud: - Range: 7 + Range: 7c0 Turreted: ROT: 12 InitialFacing: 50 @@ -746,7 +746,7 @@ FTUR: Armor: Type: Heavy RevealsShroud: - Range: 6 + Range: 6c0 Turreted: ROT: 255 Offset: 0,0,112 @@ -788,7 +788,7 @@ SAM: Armor: Type: Heavy RevealsShroud: - Range: 5 + Range: 5c0 Turreted: ROT: 30 InitialFacing: 0 @@ -829,7 +829,7 @@ ATEK: Armor: Type: Wood RevealsShroud: - Range: 10 + Range: 10c0 Bib: IronCurtainable: GpsPower: @@ -865,7 +865,7 @@ WEAP: Armor: Type: Wood RevealsShroud: - Range: 4 + Range: 4c0 Bib: -RenderBuilding: RenderBuildingWarFactory: @@ -894,7 +894,7 @@ FACT: Armor: Type: Wood RevealsShroud: - Range: 5 + Range: 5c0 Bib: Production: Produces: Building,Defense @@ -938,7 +938,7 @@ PROC: Armor: Type: Wood RevealsShroud: - Range: 6 + Range: 6c0 Bib: OreRefinery: StoresOre: @@ -982,7 +982,7 @@ SILO: Armor: Type: Wood RevealsShroud: - Range: 4 + Range: 4c0 RenderBuildingSilo: StoresOre: PipCount: 5 @@ -1013,7 +1013,7 @@ HPAD: Armor: Type: Wood RevealsShroud: - Range: 5 + Range: 5c0 Bib: Exit@1: SpawnOffset: 0,-256,0 @@ -1047,7 +1047,7 @@ AFLD: Armor: Type: Wood RevealsShroud: - Range: 7 + Range: 7c0 Exit@1: SpawnOffset: 0,170,0 ExitCell: 1,1 @@ -1098,7 +1098,7 @@ POWR: Armor: Type: Wood RevealsShroud: - Range: 4 + Range: 4c0 Bib: IronCurtainable: DeadBuildingState: @@ -1127,7 +1127,7 @@ APWR: Armor: Type: Wood RevealsShroud: - Range: 4 + Range: 4c0 Bib: IronCurtainable: DeadBuildingState: @@ -1156,7 +1156,7 @@ STEK: Armor: Type: Wood RevealsShroud: - Range: 4 + Range: 4c0 Bib: IronCurtainable: @@ -1182,7 +1182,7 @@ BARR: Armor: Type: Wood RevealsShroud: - Range: 5 + Range: 5c0 Bib: RallyPoint: Exit@1: @@ -1219,7 +1219,7 @@ TENT: Armor: Type: Wood RevealsShroud: - Range: 5 + Range: 5c0 Bib: RallyPoint: Exit@1: @@ -1246,7 +1246,7 @@ KENN: Armor: Type: Wood RevealsShroud: - Range: 4 + Range: 4c0 IronCurtainable: -EmitInfantryOnSell: -AcceptsSupplies: @@ -1273,7 +1273,7 @@ FIX: Armor: Type: Wood RevealsShroud: - Range: 5 + Range: 5c0 Reservable: RallyPoint: IronCurtainable: @@ -1301,7 +1301,7 @@ FACF: Health: HP: 30 RevealsShroud: - Range: 4 + Range: 4c0 Bib: RenderBuilding: Image: FACT @@ -1331,7 +1331,7 @@ WEAF: Health: HP: 30 RevealsShroud: - Range: 4 + Range: 4c0 Bib: -RenderBuilding: RenderBuildingWarFactory: @@ -1366,7 +1366,7 @@ SYRF: Health: HP: 30 RevealsShroud: - Range: 4 + Range: 4c0 RenderBuilding: Image: SYRD Fake: @@ -1398,7 +1398,7 @@ SPEF: Health: HP: 30 RevealsShroud: - Range: 4 + Range: 4c0 RenderBuilding: Image: SPEN Fake: @@ -1426,7 +1426,7 @@ DOMF: Health: HP: 30 RevealsShroud: - Range: 4 + Range: 4c0 Bib: RenderBuilding: Image: DOME diff --git a/mods/ra/rules/system-actors.yaml b/mods/ra/rules/system-actors.yaml index 1a3d492075..1e4e381237 100644 --- a/mods/ra/rules/system-actors.yaml +++ b/mods/ra/rules/system-actors.yaml @@ -123,7 +123,7 @@ CAMERA: Health: HP: 1000 RevealsShroud: - Range: 10 + Range: 10c0 ProximityCaptor: Types: Camera BodyOrientation: @@ -133,7 +133,7 @@ FLARE: Health: HP: 1000 RevealsShroud: - Range: 3 + Range: 3c0 RenderFlare: Image: smokland HiddenUnderFog: diff --git a/mods/ra/rules/system-world.yaml b/mods/ra/rules/system-world.yaml index 16b08f4b59..7c2889fadd 100644 --- a/mods/ra/rules/system-world.yaml +++ b/mods/ra/rules/system-world.yaml @@ -165,3 +165,4 @@ World: ValidateOrder: DebugPauseState: RadarPings: + diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index 7f3faee120..a797e9b24c 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -18,7 +18,7 @@ V2RL: Mobile: Speed: 85 RevealsShroud: - Range: 5 + Range: 5c0 Armament: Weapon: SCUD AttackFrontal: @@ -47,7 +47,7 @@ V2RL: Mobile: Speed: 128 RevealsShroud: - Range: 4 + Range: 4c0 Turreted: ROT: 5 Armament: @@ -87,7 +87,7 @@ V2RL: Speed: 85 Crushes: wall, atmine, crate, infantry RevealsShroud: - Range: 5 + Range: 5c0 Turreted: ROT: 5 Armament: @@ -129,7 +129,7 @@ V2RL: Speed: 71 Crushes: wall, atmine, crate, infantry RevealsShroud: - Range: 5 + Range: 5c0 Turreted: ROT: 5 Armament: @@ -173,7 +173,7 @@ V2RL: Speed: 42 Crushes: wall, atmine, crate, infantry RevealsShroud: - Range: 6 + Range: 6c0 Turreted: ROT: 2 Armament@PRIMARY: @@ -226,7 +226,7 @@ ARTY: ROT: 2 Speed: 85 RevealsShroud: - Range: 5 + Range: 5c0 Armament: Weapon: 155mm LocalOffset: 624,0,208 @@ -268,7 +268,7 @@ HARV: Speed: 85 Crushes: wall, atmine, crate, infantry RevealsShroud: - Range: 4 + Range: 4c0 RenderHarvester: ImagesByFullness: harvempty, harvhalf, harv GpsDot: @@ -305,7 +305,7 @@ MCV: Speed: 85 Crushes: wall, atmine, crate, infantry RevealsShroud: - Range: 4 + Range: 4c0 Transforms: IntoActor: fact Offset: -1,-1 @@ -338,7 +338,7 @@ JEEP: ROT: 10 Speed: 170 RevealsShroud: - Range: 8 + Range: 8c0 Turreted: ROT: 10 Offset: 0,0,85 @@ -373,7 +373,7 @@ APC: Mobile: Speed: 142 RevealsShroud: - Range: 5 + Range: 5c0 Armament: Weapon: M60mg LocalOffset: 0,0,171 @@ -406,7 +406,7 @@ MNLY.AP: Mobile: Speed: 128 RevealsShroud: - Range: 5 + Range: 5c0 RenderUnit: Image: MNLY Minelayer: @@ -438,7 +438,7 @@ MNLY.AT: Mobile: Speed: 128 RevealsShroud: - Range: 5 + Range: 5c0 RenderUnit: Image: MNLY Minelayer: @@ -470,7 +470,7 @@ TRUK: Mobile: Speed: 128 RevealsShroud: - Range: 3 + Range: 3c0 RenderUnit: SupplyTruck: Payload: 500 @@ -499,9 +499,9 @@ MGG: Offset: -299,0,171 Sequence: spinner RevealsShroud: - Range: 6 + Range: 6c0 CreatesShroud: - Range: 6 + Range: 6c0 RenderShroudCircle: Explodes: Weapon: UnitExplodeSmall @@ -529,7 +529,7 @@ MRJ: Mobile: Speed: 85 RevealsShroud: - Range: 6 + Range: 6c0 RenderUnit: WithIdleOverlay@SPINNER: Sequence: spinner @@ -564,7 +564,7 @@ TTNK: Speed: 113 Crushes: wall, atmine, crate, infantry RevealsShroud: - Range: 7 + Range: 7c0 Armament: Weapon: TTankZap LocalOffset: 0,0,213 @@ -596,7 +596,7 @@ FTRK: ROT: 10 Speed: 128 RevealsShroud: - Range: 4 + Range: 4c0 Turreted: ROT: 5 Offset: -298,0,298 @@ -635,7 +635,7 @@ DTRK: Mobile: Speed: 85 RevealsShroud: - Range: 3 + Range: 3c0 RenderUnit: Explodes: Weapon: MiniNuke @@ -668,7 +668,7 @@ CTNK: Speed: 113 Crushes: wall, atmine, crate, infantry RevealsShroud: - Range: 6 + Range: 6c0 RenderUnit: AutoTarget: Armament@PRIMARY: @@ -703,7 +703,7 @@ QTNK: Speed: 56 Crushes: wall, atmine, crate, infantry RevealsShroud: - Range: 6 + Range: 6c0 Selectable: Bounds: 44,38,0,-4 RenderUnit: @@ -713,3 +713,4 @@ QTNK: -EjectOnDeath: TargetableUnit: TargetTypes: Ground, MADTank + diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml index 235cabd2a5..4c8cea05ce 100644 --- a/mods/ts/rules/aircraft.yaml +++ b/mods/ts/rules/aircraft.yaml @@ -19,7 +19,7 @@ DPOD: Armor: Type: Light RevealsShroud: - Range: 0 + Range: 0c0 Cargo: Types: Infantry MaxWeight: 5 @@ -57,7 +57,7 @@ DSHP: Armor: Type: Heavy RevealsShroud: - Range: 3 + Range: 3c0 Cargo: Types: Infantry MaxWeight: 5 @@ -89,7 +89,7 @@ ORCA: Armor: Type: Light RevealsShroud: - Range: 10 + Range: 10c0 Armament: Weapon: Hellfire AttackHeli: @@ -124,7 +124,7 @@ ORCAB: Armor: Type: Light RevealsShroud: - Range: 2 + Range: 2c0 Armament: Weapon: Bomb AttackHeli: @@ -159,7 +159,7 @@ ORCATRAN: Armor: Type: Light RevealsShroud: - Range: 2 + Range: 2c0 Cargo: Types: Infantry MaxWeight: 5 @@ -190,7 +190,7 @@ TRNSPORT: Armor: Type: Light RevealsShroud: - Range: 2 + Range: 2c0 RenderSprites: RenderVoxels: WithVoxelBody: @@ -217,7 +217,7 @@ SCRIN: Armor: Type: Light RevealsShroud: - Range: 2 + Range: 2c0 Armament: Weapon: Proton AttackHeli: @@ -252,7 +252,7 @@ APACHE: Armor: Type: Light RevealsShroud: - Range: 2 + Range: 2c0 Armament: Weapon: HarpyClaw AttackHeli: diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index fd432c7e93..4682b7e9ef 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -45,7 +45,7 @@ Armor: Type: None RevealsShroud: - Range: 4 + Range: 4c0 Mobile: Crushes: crate SharesCell: yes @@ -102,7 +102,7 @@ Mobile: Speed: 71 RevealsShroud: - Range: 2 + Range: 2c0 Armament: Weapon: Pistola AttackFrontal: diff --git a/mods/ts/rules/infantry.yaml b/mods/ts/rules/infantry.yaml index 020dcd3bbf..8c2fcee6ff 100644 --- a/mods/ts/rules/infantry.yaml +++ b/mods/ts/rules/infantry.yaml @@ -191,7 +191,7 @@ UMAGON: HP: 150 Passenger: RevealsShroud: - Range: 7 + Range: 7c0 Armament: Weapon: Sniper AttackFrontal: @@ -221,7 +221,7 @@ GHOST: HP: 200 Passenger: RevealsShroud: - Range: 6 + Range: 6c0 Armament: Weapon: LtRail CrushableInfantry: @@ -256,7 +256,7 @@ JUMPJET: Passenger: PipType: Green RevealsShroud: - Range: 6 + Range: 6c0 Armament: Weapon: JumpCannon -CrushableInfantry: @@ -284,7 +284,7 @@ CHAMSPY: Mobile: Speed: 85 RevealsShroud: - Range: 9 + Range: 9c0 Passenger: TakeCover: Spy: @@ -319,7 +319,7 @@ CYBORG: HP: 300 Passenger: RevealsShroud: - Range: 5 + Range: 5c0 Armament: Weapon: Vulcan3 AttackFrontal: @@ -352,7 +352,7 @@ CYC2: HP: 500 Passenger: RevealsShroud: - Range: 7 + Range: 7c0 Armament: Weapon: Sniper AttackFrontal: @@ -380,7 +380,7 @@ MUTANT: Mobile: Speed: 56 RevealsShroud: - Range: 4 + Range: 4c0 Armament: Weapon: Vulcan AttackFrontal: @@ -408,7 +408,7 @@ MWMN: Mobile: Speed: 56 RevealsShroud: - Range: 4 + Range: 4c0 Armament: Weapon: Vulcan AttackFrontal: @@ -436,7 +436,7 @@ MUTANT3: Mobile: Speed: 56 RevealsShroud: - Range: 4 + Range: 4c0 Armament: Weapon: Vulcan AttackFrontal: @@ -464,7 +464,7 @@ MHIJACK: Mobile: Speed: 99 RevealsShroud: - Range: 6 + Range: 6c0 -AutoTarget: TakeCover: -RenderInfantry: @@ -489,7 +489,7 @@ TRATOS: Mobile: Speed: 71 RevealsShroud: - Range: 4 + Range: 4c0 TakeCover: -AutoTarget: -RenderInfantry: @@ -514,7 +514,7 @@ OXANNA: Mobile: Speed: 56 RevealsShroud: - Range: 4 + Range: 4c0 TakeCover: -AutoTarget: -RenderInfantry: @@ -539,7 +539,7 @@ SLAV: Mobile: Speed: 56 RevealsShroud: - Range: 4 + Range: 4c0 TakeCover: -AutoTarget: -RenderInfantry: @@ -562,7 +562,7 @@ DOGGIE: Armor: Type: Light RevealsShroud: - Range: 4 + Range: 4c0 Mobile: Speed: 113 Selectable: @@ -589,7 +589,7 @@ VISSML: Armor: Type: Light RevealsShroud: - Range: 0 + Range: 0c0 Mobile: Speed: 113 ROT: 16 @@ -617,7 +617,7 @@ VISLRG: Armor: Type: Light RevealsShroud: - Range: 0 + Range: 0c0 Mobile: Speed: 113 ROT: 16 diff --git a/mods/ts/rules/structures.yaml b/mods/ts/rules/structures.yaml index 7910b27226..a5c59a8fde 100644 --- a/mods/ts/rules/structures.yaml +++ b/mods/ts/rules/structures.yaml @@ -13,7 +13,7 @@ GACNST: Armor: Type: Wood RevealsShroud: - Range: 5 + Range: 5c0 Production: Produces: Building,Defense Valued: @@ -60,7 +60,7 @@ GAPOWR: Armor: Type: Wood RevealsShroud: - Range: 4 + Range: 4c0 WithIdleOverlay@LIGHTS: Sequence: idle-lights WithIdleOverlay@PLUG: @@ -88,7 +88,7 @@ GAPILE: Armor: Type: Wood RevealsShroud: - Range: 5 + Range: 5c0 Exit@1: SpawnOffset: -2730,2730,0 ExitCell: 0,2 @@ -122,7 +122,7 @@ GAWEAP: Health: HP: 1000 RevealsShroud: - Range: 4 + Range: 4c0 -RenderBuilding: RenderBuildingWarFactory: RallyPoint: @@ -157,7 +157,7 @@ NAPOWR: Armor: Type: Wood RevealsShroud: - Range: 4 + Range: 4c0 WithIdleOverlay@LIGHTS: Sequence: idle-lights @@ -183,7 +183,7 @@ NAHAND: Armor: Type: Wood RevealsShroud: - Range: 5 + Range: 5c0 Exit@1: SpawnOffset: -2730,2730,0 ExitCell: 0,2 @@ -215,7 +215,7 @@ NAWEAP: Health: HP: 1000 RevealsShroud: - Range: 4 + Range: 4c0 -RenderBuilding: RenderBuildingWarFactory: RallyPoint: @@ -266,7 +266,7 @@ GATICK: Armor: Type: Concrete RevealsShroud: - Range: 5 + Range: 5c0 Turreted: ROT: 6 InitialFacing: 128 @@ -304,7 +304,7 @@ GAICBM: Armor: Type: Wood RevealsShroud: - Range: 5 + Range: 5c0 Transforms: IntoActor: icbm Offset: 1,1 @@ -328,7 +328,7 @@ GADPSA: Armor: Type: Wood RevealsShroud: - Range: 8 + Range: 8c0 Transforms: IntoActor: lpst Offset: 1,1 @@ -355,7 +355,7 @@ GAARTY: Armor: Type: Light RevealsShroud: - Range: 9 + Range: 9c0 Selectable: Voice: Vehicle Turreted: @@ -398,7 +398,7 @@ GASPOT: Armor: Type: Wood RevealsShroud: - Range: 4 + Range: 4c0 RenderDetectionCircle: DetectCloaked: Range: 3 @@ -423,7 +423,7 @@ GAHPAD: Health: HP: 600 RevealsShroud: - Range: 5 + Range: 5c0 Exit@1: SpawnOffset: 0,-256,0 Production: @@ -455,7 +455,7 @@ NAHPAD: Health: HP: 600 RevealsShroud: - Range: 5 + Range: 5c0 Exit@1: SpawnOffset: 0,-256,0 Production: diff --git a/mods/ts/rules/system-player.yaml b/mods/ts/rules/system-player.yaml index eb6ac74e48..c718f7b955 100644 --- a/mods/ts/rules/system-player.yaml +++ b/mods/ts/rules/system-player.yaml @@ -41,3 +41,4 @@ Player: BaseAttackNotifier: PlayerStatistics: PlaceBeacon: + diff --git a/mods/ts/rules/system-world.yaml b/mods/ts/rules/system-world.yaml index a5e1818a42..e28bcc198a 100644 --- a/mods/ts/rules/system-world.yaml +++ b/mods/ts/rules/system-world.yaml @@ -96,4 +96,5 @@ World: ValidateOrder: DebugPauseState: ScreenShaker: - RadarPings: \ No newline at end of file + RadarPings: + diff --git a/mods/ts/rules/vehicles.yaml b/mods/ts/rules/vehicles.yaml index a31a83f038..b4eac175cc 100644 --- a/mods/ts/rules/vehicles.yaml +++ b/mods/ts/rules/vehicles.yaml @@ -21,7 +21,7 @@ MCV: Speed: 85 Crushes: wall, crate, infantry RevealsShroud: - Range: 4 + Range: 4c0 MustBeDestroyed: BaseBuilding: Transforms: @@ -53,7 +53,7 @@ APC: Armor: Type: Heavy RevealsShroud: - Range: 5 + Range: 5c0 Turreted: ROT: 10 Cargo: @@ -89,7 +89,7 @@ HARV: Armor: Type: Heavy RevealsShroud: - Range: 4 + Range: 4c0 -GainsExperience: RenderSprites: RenderVoxels: @@ -113,7 +113,7 @@ HVR: Armor: Type: Light RevealsShroud: - Range: 7 + Range: 7c0 Armament: Weapon: HoverMissile Turreted: @@ -144,7 +144,7 @@ HVR: Armor: Type: Heavy RevealsShroud: - Range: 6 + Range: 6c0 Turreted: ROT: 3 Armament@PRIMARY: @@ -181,7 +181,7 @@ TRUCKB: Mobile: Speed: 56 RevealsShroud: - Range: 5 + Range: 5c0 SupplyTruck: Payload: 500 RenderSprites: @@ -206,7 +206,7 @@ LPST: Speed: 85 ROT: 5 RevealsShroud: - Range: 10 + Range: 10c0 RenderSprites: RenderVoxels: WithVoxelBody: @@ -235,7 +235,7 @@ ICBM: Speed: 85 ROT: 5 RevealsShroud: - Range: 7 + Range: 7c0 RenderSprites: RenderVoxels: WithVoxelBody: @@ -263,7 +263,7 @@ REPAIR: Speed: 85 ROT: 5 RevealsShroud: - Range: 5 + Range: 5c0 Armament: Weapon: Repair AttackMedic: @@ -290,7 +290,7 @@ ART2: Speed: 71 ROT: 2 RevealsShroud: - Range: 9 + Range: 9c0 RenderSprites: RenderVoxels: WithVoxelBody: @@ -320,7 +320,7 @@ WEED: Armor: Type: Heavy RevealsShroud: - Range: 4 + Range: 4c0 -GainsExperience: RenderSprites: RenderVoxels: @@ -344,7 +344,7 @@ BUS: Armor: Type: Light RevealsShroud: - Range: 5 + Range: 5c0 Cargo: Types: Infantry MaxWeight: 20 @@ -371,7 +371,7 @@ PICK: Armor: Type: Light RevealsShroud: - Range: 5 + Range: 5c0 Cargo: Types: Infantry MaxWeight: 2 @@ -398,7 +398,7 @@ CAR: Armor: Type: Light RevealsShroud: - Range: 5 + Range: 5c0 Cargo: Types: Infantry MaxWeight: 4 @@ -425,7 +425,7 @@ GGHUNT: Armor: Type: Light RevealsShroud: - Range: 7 + Range: 7c0 RenderUnit: DemoTruck: Explodes: @@ -450,7 +450,7 @@ WINI: Armor: Type: Light RevealsShroud: - Range: 5 + Range: 5c0 Cargo: Types: Infantry MaxWeight: 5 @@ -477,7 +477,7 @@ MMCH: Armor: Type: Heavy RevealsShroud: - Range: 8 + Range: 8c0 RenderInfantry: Turreted: AttackTurreted: @@ -511,7 +511,7 @@ HMEC: Armor: Type: Heavy RevealsShroud: - Range: 8 + Range: 8c0 RenderSprites: AttackFrontal: AutoTarget: @@ -542,7 +542,7 @@ SMECH: Armor: Type: Light RevealsShroud: - Range: 6 + Range: 6c0 AttackFrontal: AutoTarget: Armament: @@ -570,7 +570,7 @@ BIKE: Armor: Type: Light RevealsShroud: - Range: 5 + Range: 5c0 Armament: Weapon: BikeMissile LocalOffset: -128, -170, 170, -128, 170, 170 @@ -600,7 +600,7 @@ BGGY: Armor: Type: Light RevealsShroud: - Range: 6 + Range: 6c0 Armament: Weapon: RaiderCannon AttackFrontal: @@ -628,7 +628,7 @@ SAPC: Armor: Type: Heavy RevealsShroud: - Range: 5 + Range: 5c0 Cargo: Types: Infantry MaxWeight: 5 @@ -656,7 +656,7 @@ SUBTANK: Armor: Type: Light RevealsShroud: - Range: 5 + Range: 5c0 Armament: Weapon: FireballLauncher AttackFrontal: @@ -683,7 +683,7 @@ SONIC: Armor: Type: Heavy RevealsShroud: - Range: 7 + Range: 7c0 Armament: Weapon: SonicZap AttackTurreted: @@ -712,7 +712,7 @@ TTNK: Armor: Type: Light RevealsShroud: - Range: 5 + Range: 5c0 RenderSprites: RenderVoxels: WithVoxelBody: @@ -742,7 +742,7 @@ STNK: Armor: Type: Light RevealsShroud: - Range: 5 + Range: 5c0 Cloak: InitialDelay: 90 CloakDelay: 90 From a538914d6c1969c31307772a9938e830faf06995 Mon Sep 17 00:00:00 2001 From: Chicken man Date: Wed, 5 Mar 2014 16:46:42 -0500 Subject: [PATCH 4/4] Updated maps to work with changes. --- mods/cnc/maps/gdi02/map.yaml | 4 ++-- mods/cnc/maps/nod03a/map.yaml | 2 +- mods/cnc/maps/nod03b/map.yaml | 24 +------------------ mods/cnc/maps/the-hot-box/map.yaml | 2 +- mods/ra/maps/Fort-Lonestar/map.yaml | 18 +++++++------- mods/ra/maps/Survival01/map.yaml | 2 +- mods/ra/maps/Survival02/map.yaml | 2 +- mods/ra/maps/allies-01-classic/map.yaml | 4 ++-- mods/ra/maps/allies-01/map.yaml | 4 ++-- mods/ra/maps/allies-02/map.yaml | 4 ++-- mods/ra/maps/allies-03/map.yaml | 4 ++-- mods/ra/maps/allies-04/map.yaml | 6 ++--- mods/ra/maps/apollo/map.yaml | 2 +- mods/ra/maps/artemis/map.yaml | 2 +- mods/ra/maps/bomber-john/map.yaml | 2 +- mods/ra/maps/dionysus/map.yaml | 2 +- .../maps/drop-zone-battle-of-tikiaki/map.yaml | 2 +- mods/ra/maps/drop-zone-w/map.yaml | 2 +- mods/ra/maps/drop-zone/map.yaml | 2 +- mods/ra/maps/koth-athena/map.yaml | 2 +- mods/ra/maps/koth-crossroads/map.yaml | 2 +- mods/ra/maps/koth-island-hoppers/map.yaml | 2 +- mods/ra/maps/monster-tank-madness/map.yaml | 4 ++-- mods/ra/maps/soviet-01-classic/map.yaml | 4 ++-- mods/ra/maps/zeus/map.yaml | 2 +- 25 files changed, 42 insertions(+), 64 deletions(-) diff --git a/mods/cnc/maps/gdi02/map.yaml b/mods/cnc/maps/gdi02/map.yaml index 451fa42068..a797dc96e9 100644 --- a/mods/cnc/maps/gdi02/map.yaml +++ b/mods/cnc/maps/gdi02/map.yaml @@ -2,6 +2,8 @@ Selectable: True MapFormat: 6 +RequiresMod: cnc + Title: Knock out the Refinery Author: Westwood Studios @@ -16,8 +18,6 @@ UseAsShellmap: False Type: Campaign -RequiresMod: cnc - Options: Crates: False Fog: False diff --git a/mods/cnc/maps/nod03a/map.yaml b/mods/cnc/maps/nod03a/map.yaml index 8e0c4aff27..5af37e76bd 100644 --- a/mods/cnc/maps/nod03a/map.yaml +++ b/mods/cnc/maps/nod03a/map.yaml @@ -645,7 +645,7 @@ Rules: Health: HP: 750 RevealsShroud: - Range: 10 + Range: 10c0 Bib: ProvidesRadar: RenderDetectionCircle: diff --git a/mods/cnc/maps/nod03b/map.yaml b/mods/cnc/maps/nod03b/map.yaml index effaf9bff8..f72b40b26b 100644 --- a/mods/cnc/maps/nod03b/map.yaml +++ b/mods/cnc/maps/nod03b/map.yaml @@ -462,11 +462,6 @@ Actors: Owner: Nod Health: 1 Facing: 128 -# Actor71: bggy -# Location: 48,38 -# Owner: Nod -# Health: 0.9921875 -# Facing: 128 Actor72: jeep Location: 28,21 Owner: GDI @@ -507,11 +502,6 @@ Actors: Owner: Nod Health: 1 Facing: 128 -# Actor80: bggy -# Location: 48,37 -# Owner: Nod -# Health: 1 -# Facing: 128 Actor83: e6 Location: 48,40 Owner: Nod @@ -572,24 +562,12 @@ Actors: Health: 1 Facing: 224 SubCell: 4 -# Actor110: e1 -# Location: 51,41 -# Owner: Nod -# Health: 1 -# Facing: 128 -# SubCell: 3 Actor112: e1 Location: 50,40 Owner: Nod Health: 1 Facing: 128 SubCell: 3 -# Actor113: e1 -# Location: 51,40 -# Owner: Nod -# Health: 1 -# Facing: 128 -# SubCell: 3 Actor114: e1 Location: 50,40 Owner: Nod @@ -736,7 +714,7 @@ Rules: Health: HP: 750 RevealsShroud: - Range: 10 + Range: 10c0 Bib: ProvidesRadar: RenderDetectionCircle: diff --git a/mods/cnc/maps/the-hot-box/map.yaml b/mods/cnc/maps/the-hot-box/map.yaml index bdd83e9400..205273c280 100644 --- a/mods/cnc/maps/the-hot-box/map.yaml +++ b/mods/cnc/maps/the-hot-box/map.yaml @@ -236,7 +236,7 @@ Rules: Health: HP: 1000 RevealsShroud: - Range: 40 + Range: 40c0 MustBeDestroyed: -AttackMove: diff --git a/mods/ra/maps/Fort-Lonestar/map.yaml b/mods/ra/maps/Fort-Lonestar/map.yaml index 0741348d68..183929ed0b 100644 --- a/mods/ra/maps/Fort-Lonestar/map.yaml +++ b/mods/ra/maps/Fort-Lonestar/map.yaml @@ -530,7 +530,7 @@ Rules: Type: Wood Bib: RevealsShroud: - Range: 3 + Range: 3c0 ExternalCapturable: ExternalCapturableBar: EngineerRepairable: @@ -766,7 +766,7 @@ Rules: Speed: 71 Crushes: wall, atmine, crate, infantry RevealsShroud: - Range: 7 + Range: 7c0 Turreted: ROT: 5 Armament: @@ -820,7 +820,7 @@ Rules: Passenger: PipType: Red RevealsShroud: - Range: 6 + Range: 6c0 AutoTarget: InitialStance: Defend Armament: @@ -842,7 +842,7 @@ Rules: Mobile: Speed: 56 RevealsShroud: - Range: 5 + Range: 5c0 Passenger: PipType: Yellow TakeCover: @@ -865,7 +865,7 @@ Rules: ROT: 10 Speed: 128 RevealsShroud: - Range: 4 + Range: 4c0 Turreted: ROT: 5 Offset: -298,0,298 @@ -890,7 +890,7 @@ Rules: Mobile: Speed: 142 RevealsShroud: - Range: 5 + Range: 5c0 Armament: Weapon: M60mg LocalOffset: 0,0,171 @@ -922,7 +922,7 @@ Rules: ROT: 2 Speed: 85 RevealsShroud: - Range: 7 + Range: 7c0 AttackFrontal: PrimaryWeapon: 155mm SecondaryWeapon: 155mm @@ -940,7 +940,7 @@ Rules: Mobile: Speed: 99 RevealsShroud: - Range: 5 + Range: 5c0 Armament: Weapon: SCUD AttackFrontal: @@ -959,7 +959,7 @@ Rules: Mobile: Speed: 56 RevealsShroud: - Range: 14 + Range: 14c0 Turreted: ROT: 1 AttackTurreted: diff --git a/mods/ra/maps/Survival01/map.yaml b/mods/ra/maps/Survival01/map.yaml index cccc87cc08..9739b49cae 100644 --- a/mods/ra/maps/Survival01/map.yaml +++ b/mods/ra/maps/Survival01/map.yaml @@ -1314,7 +1314,7 @@ Rules: CAMERA.Large: Inherits: CAMERA RevealsShroud: - Range: 1000 + Range: 1000c0 Sequences: diff --git a/mods/ra/maps/Survival02/map.yaml b/mods/ra/maps/Survival02/map.yaml index bc686d4ba8..895b23c017 100644 --- a/mods/ra/maps/Survival02/map.yaml +++ b/mods/ra/maps/Survival02/map.yaml @@ -1115,7 +1115,7 @@ Rules: Owner: None CAMERA: RevealsShroud: - Range: 7 + Range: 7c0 Sequences: diff --git a/mods/ra/maps/allies-01-classic/map.yaml b/mods/ra/maps/allies-01-classic/map.yaml index be4b5e9d77..ceccf30c61 100644 --- a/mods/ra/maps/allies-01-classic/map.yaml +++ b/mods/ra/maps/allies-01-classic/map.yaml @@ -585,7 +585,7 @@ Rules: RenderUnit: Image: tran RevealsShroud: - Range: 0 + Range: 0c0 RejectsOrders: -Selectable: Cargo: @@ -602,7 +602,7 @@ Rules: CargoType: Einstein ^CivInfantry: RevealsShroud: - Range: 0 + Range: 0c0 Sequences: diff --git a/mods/ra/maps/allies-01/map.yaml b/mods/ra/maps/allies-01/map.yaml index 87b9b7cdc6..812dcfdb25 100644 --- a/mods/ra/maps/allies-01/map.yaml +++ b/mods/ra/maps/allies-01/map.yaml @@ -368,7 +368,7 @@ Rules: TRAN: -Selectable: RevealsShroud: - Range: 0 + Range: 0c0 E7: AutoTarget: InitialStance: Defend @@ -405,7 +405,7 @@ Rules: CAMERA.Large: Inherits: CAMERA RevealsShroud: - Range: 1000 + Range: 1000c0 Sequences: diff --git a/mods/ra/maps/allies-02/map.yaml b/mods/ra/maps/allies-02/map.yaml index e94a0f4adb..d904a22c3a 100644 --- a/mods/ra/maps/allies-02/map.yaml +++ b/mods/ra/maps/allies-02/map.yaml @@ -1774,7 +1774,7 @@ Rules: Buildable: Owner: None RevealsShroud: - Range: 0 + Range: 0c0 TENT: ProvidesCustomPrerequisite: Prerequisite: barracks @@ -1932,7 +1932,7 @@ Rules: CAMERA.Large: Inherits: CAMERA RevealsShroud: - Range: 1000 + Range: 1000c0 Sequences: diff --git a/mods/ra/maps/allies-03/map.yaml b/mods/ra/maps/allies-03/map.yaml index ff11e93807..41f5342ce3 100644 --- a/mods/ra/maps/allies-03/map.yaml +++ b/mods/ra/maps/allies-03/map.yaml @@ -1558,14 +1558,14 @@ Rules: Buildable: Owner: None CreatesShroud: - Range: 6 + Range: 6c0 GAP: Buildable: Owner: None CAMERA.Large: Inherits: CAMERA RevealsShroud: - Range: 1000 + Range: 1000c0 Sequences: diff --git a/mods/ra/maps/allies-04/map.yaml b/mods/ra/maps/allies-04/map.yaml index 60d81d3589..b57b929b5e 100644 --- a/mods/ra/maps/allies-04/map.yaml +++ b/mods/ra/maps/allies-04/map.yaml @@ -1848,7 +1848,7 @@ Rules: Health: HP: 100 RevealsShroud: - Range: 6 + Range: 6c0 Spy: Infiltrates: Types: Lab, Truck @@ -1879,7 +1879,7 @@ Rules: Selectable: Voice: SpyVoice RevealsShroud: - Range: 6 + Range: 6c0 BARL: Allies04TrivialBuilding: BRL3: @@ -1985,7 +1985,7 @@ Rules: CAMERA.Large: Inherits: CAMERA RevealsShroud: - Range: 1000 + Range: 1000c0 Sequences: truk: diff --git a/mods/ra/maps/apollo/map.yaml b/mods/ra/maps/apollo/map.yaml index 62e9949861..56f0352106 100644 --- a/mods/ra/maps/apollo/map.yaml +++ b/mods/ra/maps/apollo/map.yaml @@ -2605,7 +2605,7 @@ Rules: Tooltip: Name: Wuschel's Wall Street Speculator HQ RevealsShroud: - Range: 30 + Range: 30c0 Health: HP: 2000 Armor: diff --git a/mods/ra/maps/artemis/map.yaml b/mods/ra/maps/artemis/map.yaml index f451b02e11..3fc4d56f52 100644 --- a/mods/ra/maps/artemis/map.yaml +++ b/mods/ra/maps/artemis/map.yaml @@ -2939,7 +2939,7 @@ Rules: RenderBuilding: Scale: 0.75 RevealsShroud: - Range: 20 + Range: 20c0 Health: HP: 1500 Armor: diff --git a/mods/ra/maps/bomber-john/map.yaml b/mods/ra/maps/bomber-john/map.yaml index fc87f1c71f..2be00f3d28 100644 --- a/mods/ra/maps/bomber-john/map.yaml +++ b/mods/ra/maps/bomber-john/map.yaml @@ -829,7 +829,7 @@ Rules: WaitSpread: 1 ROT: 900 RevealsShroud: - Range: 40 + Range: 40c0 RenderUnit: Image: MNLY MustBeDestroyed: diff --git a/mods/ra/maps/dionysus/map.yaml b/mods/ra/maps/dionysus/map.yaml index 6d4da8f4da..6c896c1f85 100644 --- a/mods/ra/maps/dionysus/map.yaml +++ b/mods/ra/maps/dionysus/map.yaml @@ -2156,7 +2156,7 @@ Rules: Tooltip: Name: Wuschel's Wall Street Speculator HQ RevealsShroud: - Range: 30 + Range: 30c0 Health: HP: 2000 Armor: diff --git a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml index c597f07cac..671f34f258 100644 --- a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml +++ b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml @@ -325,7 +325,7 @@ Rules: Health: HP: 1000 RevealsShroud: - Range: 40 + Range: 40c0 MustBeDestroyed: -AttackMove: HARV: diff --git a/mods/ra/maps/drop-zone-w/map.yaml b/mods/ra/maps/drop-zone-w/map.yaml index 29575a7399..8e9bda9a13 100644 --- a/mods/ra/maps/drop-zone-w/map.yaml +++ b/mods/ra/maps/drop-zone-w/map.yaml @@ -255,7 +255,7 @@ Rules: Mobile: Speed: 170 RevealsShroud: - Range: 50 + Range: 50c0 Armament@PRIMARY: Weapon: M60mg Armament@SECONDARY: diff --git a/mods/ra/maps/drop-zone/map.yaml b/mods/ra/maps/drop-zone/map.yaml index abfa3d25c6..7b75d0de9d 100644 --- a/mods/ra/maps/drop-zone/map.yaml +++ b/mods/ra/maps/drop-zone/map.yaml @@ -220,7 +220,7 @@ Rules: Health: HP: 1000 RevealsShroud: - Range: 40 + Range: 40c0 MustBeDestroyed: -AttackMove: HARV: diff --git a/mods/ra/maps/koth-athena/map.yaml b/mods/ra/maps/koth-athena/map.yaml index 1a2cc43501..1305246ce3 100644 --- a/mods/ra/maps/koth-athena/map.yaml +++ b/mods/ra/maps/koth-athena/map.yaml @@ -2108,7 +2108,7 @@ Rules: Tooltip: Name: Strategic Point RevealsShroud: - Range: 18 + Range: 18c0 Invulnerable: -Selectable: -TargetableBuilding: diff --git a/mods/ra/maps/koth-crossroads/map.yaml b/mods/ra/maps/koth-crossroads/map.yaml index 684b62ee83..b5e2a96984 100644 --- a/mods/ra/maps/koth-crossroads/map.yaml +++ b/mods/ra/maps/koth-crossroads/map.yaml @@ -259,7 +259,7 @@ Rules: Tooltip: Name: Strategic Point RevealsShroud: - Range: 20 + Range: 20c0 Invulnerable: -Selectable: -TargetableBuilding: diff --git a/mods/ra/maps/koth-island-hoppers/map.yaml b/mods/ra/maps/koth-island-hoppers/map.yaml index 417c583610..1a08bece6b 100644 --- a/mods/ra/maps/koth-island-hoppers/map.yaml +++ b/mods/ra/maps/koth-island-hoppers/map.yaml @@ -162,7 +162,7 @@ Rules: Building: BaseNormal: false RevealsShroud: - Range: 20 + Range: 20c0 Invulnerable: -Selectable: -TargetableBuilding: diff --git a/mods/ra/maps/monster-tank-madness/map.yaml b/mods/ra/maps/monster-tank-madness/map.yaml index cf7e975120..af4d13bfa9 100644 --- a/mods/ra/maps/monster-tank-madness/map.yaml +++ b/mods/ra/maps/monster-tank-madness/map.yaml @@ -2581,7 +2581,7 @@ Rules: Speed: 42 Crushes: wall, atmine, crate, infantry RevealsShroud: - Range: 6 + Range: 6c0 Turreted: ROT: 1 Armament@PRIMARY: @@ -2735,7 +2735,7 @@ Rules: CAMERA.Large: Inherits: CAMERA RevealsShroud: - Range: 1000 + Range: 1000c0 Sequences: diff --git a/mods/ra/maps/soviet-01-classic/map.yaml b/mods/ra/maps/soviet-01-classic/map.yaml index 0633bf3777..276341e6a3 100644 --- a/mods/ra/maps/soviet-01-classic/map.yaml +++ b/mods/ra/maps/soviet-01-classic/map.yaml @@ -909,7 +909,7 @@ Rules: Armor: Type: Wood RevealsShroud: - Range: 7 + Range: 7c0 Exit@1: SpawnOffset: 0,170,0 ExitCell: 1,1 @@ -938,7 +938,7 @@ Rules: CAMERA.Large: Inherits: CAMERA RevealsShroud: - Range: 1000 + Range: 1000c0 Sequences: diff --git a/mods/ra/maps/zeus/map.yaml b/mods/ra/maps/zeus/map.yaml index 89da0052a4..9198ba7990 100644 --- a/mods/ra/maps/zeus/map.yaml +++ b/mods/ra/maps/zeus/map.yaml @@ -2571,7 +2571,7 @@ Rules: RenderBuilding: Scale: 0.75 RevealsShroud: - Range: 25 + Range: 25c0 Health: HP: 2000 Armor: