diff --git a/OpenRA.Mods.Cnc/Widgets/ProductionPaletteWidget.cs b/OpenRA.Mods.Cnc/Widgets/ProductionPaletteWidget.cs index b172f81fc9..3d174acd16 100755 --- a/OpenRA.Mods.Cnc/Widgets/ProductionPaletteWidget.cs +++ b/OpenRA.Mods.Cnc/Widgets/ProductionPaletteWidget.cs @@ -16,6 +16,7 @@ using OpenRA.Graphics; using OpenRA.Mods.RA; using OpenRA.Mods.RA.Buildings; using OpenRA.Mods.RA.Orders; +using OpenRA.Traits; using OpenRA.Widgets; namespace OpenRA.Mods.Cnc.Widgets @@ -53,7 +54,6 @@ namespace OpenRA.Mods.Cnc.Widgets public override Rectangle EventBounds { get { return eventBounds; } } Dictionary icons = new Dictionary(); - Dictionary iconSprites; Animation cantBuild, clock; Rectangle eventBounds = Rectangle.Empty; readonly WorldRenderer worldRenderer; @@ -71,13 +71,6 @@ namespace OpenRA.Mods.Cnc.Widgets cantBuild = new Animation("clock"); cantBuild.PlayFetchIndex("idle", () => 0); clock = new Animation("clock"); - - iconSprites = Rules.Info.Values - .Where(u => u.Traits.Contains() && u.Name[0] != '^') - .ToDictionary( - u => u.Name, - u => Game.modData.SpriteLoader.LoadAllSprites( - u.Traits.Get().Icon ?? (u.Name + "icon"))[0]); } public override void Tick() @@ -186,10 +179,12 @@ namespace OpenRA.Mods.Cnc.Widgets var x = i % Columns; var y = i / Columns; var rect = new Rectangle(rb.X + x * 64 + 1, rb.Y + y * 48 + 1, 64, 48); + var icon = new Animation(RenderSimple.GetImage(item)); + icon.Play(item.Traits.Get().Icon); var pi = new ProductionIcon() { Name = item.Name, - Sprite = iconSprites[item.Name], + Sprite = icon.Image, Pos = new float2(rect.Location), Queued = CurrentQueue.AllQueued().Where(a => a.Item == item.Name).ToList(), }; diff --git a/OpenRA.Mods.RA/Tooltip.cs b/OpenRA.Mods.RA/Tooltip.cs index c7f5788e69..e014b9b30b 100644 --- a/OpenRA.Mods.RA/Tooltip.cs +++ b/OpenRA.Mods.RA/Tooltip.cs @@ -18,8 +18,9 @@ namespace OpenRA.Mods.RA { public readonly string Description = ""; public readonly string Name = ""; - [Desc("Defaults to actor name + icon suffix.")] - public readonly string Icon = null; + + [Desc("Sequence of the actor that contains the cameo.")] + public readonly string Icon = "icon"; public virtual object Create(ActorInitializer init) { return new Tooltip(init.self, this); } } diff --git a/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs b/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs index 8b2b49eb94..acdd435eb2 100755 --- a/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs +++ b/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs @@ -37,7 +37,6 @@ namespace OpenRA.Mods.RA.Widgets List VisibleQueues; bool paletteOpen = false; - Dictionary iconSprites; float2 paletteOpenOrigin = new float2(Game.viewport.Width - 215, 280); float2 paletteClosedOrigin = new float2(Game.viewport.Width - 16, 280); @@ -67,13 +66,6 @@ namespace OpenRA.Mods.RA.Widgets paletteOrigin = paletteClosedOrigin; VisibleQueues = new List(); CurrentQueue = null; - - iconSprites = Rules.Info.Values - .Where(u => u.Traits.Contains() && u.Name[0] != '^') - .ToDictionary( - u => u.Name, - u => Game.modData.SpriteLoader.LoadAllSprites( - u.Traits.Get().Icon ?? (u.Name + "icon"))[0]); } public override Rectangle EventBounds @@ -230,7 +222,9 @@ namespace OpenRA.Mods.RA.Widgets { var rect = new RectangleF(origin.X + x * IconWidth, origin.Y + IconHeight * y, IconWidth, IconHeight); var drawPos = new float2(rect.Location); - WidgetUtils.DrawSHP(iconSprites[item.Name], drawPos, worldRenderer); + var icon = new Animation(RenderSimple.GetImage(item)); + icon.Play(item.Traits.Get().Icon); + WidgetUtils.DrawSHP(icon.Image, drawPos, worldRenderer); var firstOfThis = queue.AllQueued().FirstOrDefault(a => a.Item == item.Name); diff --git a/OpenRA.Mods.RA/Widgets/ObserverProductionIconsWidget.cs b/OpenRA.Mods.RA/Widgets/ObserverProductionIconsWidget.cs index ae598f6916..2b8bde5610 100644 --- a/OpenRA.Mods.RA/Widgets/ObserverProductionIconsWidget.cs +++ b/OpenRA.Mods.RA/Widgets/ObserverProductionIconsWidget.cs @@ -13,6 +13,7 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; using OpenRA.Graphics; +using OpenRA.Traits; using OpenRA.Widgets; namespace OpenRA.Mods.RA.Widgets @@ -20,7 +21,6 @@ namespace OpenRA.Mods.RA.Widgets public class ObserverProductionIconsWidget : Widget { public Func GetPlayer; - Dictionary iconSprites; World world; WorldRenderer worldRenderer; Dictionary clocks; @@ -29,10 +29,6 @@ namespace OpenRA.Mods.RA.Widgets public ObserverProductionIconsWidget(World world, WorldRenderer worldRenderer) : base() { - iconSprites = Rules.Info.Values.Where(u => u.Traits.Contains() && u.Name[0] != '^') - .ToDictionary( - u => u.Name, - u => Game.modData.SpriteLoader.LoadAllSprites(u.Traits.Get().Icon ?? (u.Name + "icon"))[0]); this.world = world; this.worldRenderer = worldRenderer; clocks = new Dictionary(); @@ -42,7 +38,6 @@ namespace OpenRA.Mods.RA.Widgets : base(other) { GetPlayer = other.GetPlayer; - iconSprites = other.iconSprites; world = other.world; worldRenderer = other.worldRenderer; clocks = other.clocks; @@ -67,25 +62,27 @@ namespace OpenRA.Mods.RA.Widgets } foreach (var queue in queues) { - var item = queue.Trait.CurrentItem(); + var item = queue.Trait.AllItems().FirstOrDefault(); if (item == null) - { continue; - } - var sprite = iconSprites[item.Item]; - var size = sprite.size / new float2(2, 2); + var icon = new Animation(RenderSimple.GetImage(item)); + icon.Play(item.Traits.Get().Icon); + var size = icon.Image.size / new float2(2, 2); var location = new float2(RenderBounds.Location) + new float2(queue.i * (int)size.Length, 0); - WidgetUtils.DrawSHP(sprite, location, worldRenderer, size); + WidgetUtils.DrawSHP(icon.Image, location, worldRenderer, size); + var current = queue.Trait.CurrentItem(); + if (current == null) + continue; var clock = clocks[queue.Trait]; clock.PlayFetchIndex("idle", - () => item.TotalTime == 0 ? 0 : ((item.TotalTime - item.RemainingTime) - * (clock.CurrentSequence.Length - 1) / item.TotalTime)); + () => current.TotalTime == 0 ? 0 : ((current.TotalTime - current.RemainingTime) + * (clock.CurrentSequence.Length - 1) / current.TotalTime)); clock.Tick(); WidgetUtils.DrawSHP(clock.Image, location, worldRenderer, size); var tiny = Game.Renderer.Fonts["Tiny"]; - var text = GetOverlayForItem(item); + var text = GetOverlayForItem(current); tiny.DrawTextWithContrast(text, location + new float2(16, 16) - new float2(tiny.Measure(text).X / 2, 0), Color.White, Color.Black, 1); diff --git a/mods/cnc/rules/aircraft.yaml b/mods/cnc/rules/aircraft.yaml index 49fd8db64c..1608909af2 100644 --- a/mods/cnc/rules/aircraft.yaml +++ b/mods/cnc/rules/aircraft.yaml @@ -4,7 +4,6 @@ TRAN: Cost: 750 Tooltip: Name: Chinook Transport - Icon:tranicnh Description: Fast Infantry Transport Helicopter.\n Unarmed Buildable: BuildPaletteOrder: 10 @@ -47,7 +46,6 @@ HELI: Cost: 1200 Tooltip: Name: Apache Longbow - Icon: heliicnh Description: Helicopter Gunship with Chainguns.\n Strong vs Infantry, Light Vehicles\n Weak vs Tanks Buildable: BuildPaletteOrder: 20 @@ -100,7 +98,6 @@ ORCA: Cost: 1200 Tooltip: Name: Orca - Icon: orcaicnh Description: Helicopter Gunship with AG Missiles.\n Strong vs Buildings, Tanks\n Weak vs Infantry Buildable: BuildPaletteOrder: 20 @@ -148,7 +145,6 @@ C17: Tooltip: Name: Supply Aircraft Description: Drops vehicle reinforcements on Airstrips - Icon: c17icnh Valued: Cost: 2000 Plane: @@ -175,7 +171,6 @@ A10: Inherits: ^Plane Tooltip: Name: A10 Bomber - Icon: a10icnh Description: Used to deliver Napalm strikes. Valued: Cost: 2000 diff --git a/mods/cnc/rules/infantry.yaml b/mods/cnc/rules/infantry.yaml index 4750ba8706..de45d06684 100644 --- a/mods/cnc/rules/infantry.yaml +++ b/mods/cnc/rules/infantry.yaml @@ -5,7 +5,6 @@ E1: Tooltip: Name: Minigunner Description: General-purpose infantry.\n Strong vs Infantry\n Weak vs Vehicles - Icon: e1icnh Buildable: BuildPaletteOrder: 10 Owner: gdi, nod @@ -30,7 +29,6 @@ E2: Tooltip: Name: Grenadier Description: Infantry armed with grenades. \n Strong vs Buildings, Infantry\n Weak vs Vehicles - Icon: e2icnh Buildable: BuildPaletteOrder: 40 Prerequisites: anyhq @@ -62,7 +60,6 @@ E3: Tooltip: Name: Rocket Soldier Description: Anti-tank/Anti-aircraft infantry. \n Strong vs Tanks, Aircraft\n Weak vs Infantry - Icon: e3icnh Buildable: BuildPaletteOrder: 20 Owner: nod, gdi @@ -89,7 +86,6 @@ E4: Tooltip: Name: Flamethrower Description: Advanced Anti-infantry unit.\n Strong vs Infantry, Buildings\n Weak vs Vehicles - Icon: e4icnh Buildable: BuildPaletteOrder: 40 Owner: nod @@ -118,7 +114,6 @@ E5: Tooltip: Name: Chem Warrior Description: Advanced Anti-infantry unit.\n Strong vs Infantry\n Weak vs Vehicles - Icon: e5icnh Buildable: BuildPaletteOrder: 50 Owner: nod @@ -153,7 +148,6 @@ E6: Tooltip: Name: Engineer Description: Infiltrates and captures enemy structures.\n Strong vs Nothing\n Weak vs Everything - Icon: e6icnh Buildable: BuildPaletteOrder: 30 Owner: gdi,nod @@ -181,7 +175,6 @@ RMBO: Valued: Cost: 1000 Tooltip: - Icon: rmboicnh Name: Commando Description: Elite sniper infantry unit.\n Strong vs Infantry, Buildings\n Weak vs Vehicles Buildable: @@ -224,7 +217,6 @@ PVICE: Owner: gdi, nod Tooltip: Description: Mutated abomination that spits liquid tiberium.\n Strong vs Infantry, Buildings\n Weak vs Aircraft - Icon: viceicnh DrawLineToTarget: SelectionDecorations: ActorLostNotification: @@ -234,7 +226,6 @@ STEG: Tooltip: Name: Stegosaurus Description: A large, heavily built, herbivorous quadruped - Icon: stegicnh Armament: Weapon: tail @@ -243,7 +234,6 @@ TREX: Tooltip: Name: Tyrannosaurus rex Description: Bipedal carnivore with a massive skull - Icon: trexicnh Armament: Weapon: teeth @@ -252,7 +242,6 @@ TRIC: Tooltip: Name: Triceratops Description: Quadruped with large bony frill and three horns - Icon: tricicnh Armament: Weapon: horn @@ -261,6 +250,5 @@ RAPT: Tooltip: Name: Velociraptor Description: Bipedal with enlarged sickle-shaped claw on each hindfoot - Icon: rapticnh Armament: Weapon: claw diff --git a/mods/cnc/rules/ships.yaml b/mods/cnc/rules/ships.yaml index 520c144d20..a4fc8c43c5 100644 --- a/mods/cnc/rules/ships.yaml +++ b/mods/cnc/rules/ships.yaml @@ -4,7 +4,6 @@ BOAT: Cost: 300 Tooltip: Name: Gunboat - Icon: boaticnh Health: HP: 700 Armor: diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml index c8c49ade2e..15884f469a 100644 --- a/mods/cnc/rules/structures.yaml +++ b/mods/cnc/rules/structures.yaml @@ -11,7 +11,6 @@ FACT: Tooltip: Name: Construction Yard Description: Builds structures - Icon: facticnh Building: Power: 15 Footprint: xxx xxx @@ -55,7 +54,6 @@ NUKE: Cost: 300 Tooltip: Name: Power Plant - Icon: nukeicnh Description: Generates power ProvidesCustomPrerequisite: Prerequisite: anypower @@ -79,7 +77,6 @@ NUK2: Cost: 500 Tooltip: Name: Advanced Power Plant - Icon:nuk2icnh Description: Provides more power, cheaper than the \nstandard Power Plant ProvidesCustomPrerequisite: Prerequisite: anypower @@ -103,7 +100,6 @@ PROC: Cost: 1500 Tooltip: Name: Tiberium Refinery - Icon: procicnh Description: Processes raw Tiberium\ninto useable resources Buildable: BuildPaletteOrder: 20 @@ -142,7 +138,6 @@ SILO: Cost: 300 Tooltip: Name: Tiberium Silo - Icon: siloicnh Description: Stores processed Tiberium Buildable: Queue: Defense @@ -174,7 +169,6 @@ PYLE: Cost: 300 Tooltip: Name: Barracks - Icon: pyleicnh Description: Trains infantry ProvidesCustomPrerequisite: Prerequisite: barracks @@ -213,7 +207,6 @@ HAND: Cost: 300 Tooltip: Name: Hand of Nod - Icon: handicnh Description: Trains infantry ProvidesCustomPrerequisite: Prerequisite: barracks @@ -249,7 +242,6 @@ AFLD: Cost: 2000 Tooltip: Name: Airstrip - Icon: afldicnh Description: Provides a dropzone\nfor vehicle reinforcements ProvidesCustomPrerequisite: Prerequisite: vehicleproduction @@ -287,7 +279,6 @@ WEAP: Cost: 2000 Tooltip: Name: Weapons Factory - Icon: weapicnh Description: Assembly point for\nvehicle reinforcements ProvidesCustomPrerequisite: Prerequisite: vehicleproduction @@ -326,7 +317,6 @@ HPAD: Cost: 1000 Tooltip: Name: Helipad - Icon:hpadicnh Description: Produces, rearms and\nrepairs helicopters Buildable: BuildPaletteOrder: 60 @@ -362,7 +352,6 @@ HQ: Cost: 1000 Tooltip: Name: Communications Center - Icon: hqicnh Description: Provides an overview of the battlefield.\n Requires power to operate. ProvidesCustomPrerequisite: Prerequisite: anyhq @@ -399,7 +388,6 @@ FIX: Cost: 500 Tooltip: Name: Repair Facility - Icon: fixicnh Description: Repairs vehicles Buildable: BuildPaletteOrder: 80 @@ -425,7 +413,6 @@ EYE: Cost: 1800 Tooltip: Name: Advanced Communications Center - Icon: eyeicnh Description: Provides access to the Ion Cannon.\n Requires power to operate. ProvidesCustomPrerequisite: Prerequisite: anyhq @@ -465,7 +452,6 @@ TMPL: Cost: 2000 Tooltip: Name: Temple of Nod - Icon: tmplicnh Description: Place of worship and secret missile silo.\n Requires power to operate. ProvidesCustomPrerequisite: Prerequisite: anyhq @@ -500,7 +486,6 @@ GUN: Cost: 600 Tooltip: Name: Turret - Icon: gunicnh Description: Anti-Armor base defense.\n Strong vs Tanks\n Weak vs Infantry, Aircraft Buildable: Queue: Defense @@ -538,7 +523,6 @@ SAM: Cost: 750 Tooltip: Name: SAM Site - Icon: samicnh Description: Anti-Air base defense.\n Strong vs Aircraft\n Weak vs Infantry, Tanks Buildable: Queue: Defense @@ -575,7 +559,6 @@ OBLI: Cost: 1500 Tooltip: Name: Obelisk of Light - Icon:obliicnh Description: Advanced base defense.\n Requires power to operate.\n Strong vs Tanks, Infantry\n Weak vs Aircraft Buildable: Queue: Defense @@ -616,7 +599,6 @@ GTWR: Cost: 500 Tooltip: Name: Guard Tower - Icon: gtwricnh Description: Basic defensive structure.\n Strong vs Infantry\n Weak vs Tanks, Aircraft Buildable: Queue: Defense @@ -652,7 +634,6 @@ ATWR: Cost: 1000 Tooltip: Name: Advanced Guard Tower - Icon: atwricnh Description: Anti-armor defensive structure.\n Strong vs Light Vehicles, Tanks\n Weak vs Infantry Buildable: Queue: Defense @@ -694,7 +675,6 @@ SBAG: Value: 0 Tooltip: Name: Sandbag Barrier - Icon:sbagicnh Description: Stops infantry and blocks enemy fire.\nCan be crushed by tanks. Buildable: Queue: Defense @@ -714,7 +694,6 @@ CYCL: Value: 0 Tooltip: Name: Chain Link Barrier - Icon:cyclicnh Description: Stops infantry and blocks enemy fire.\nCan be crushed by tanks. Buildable: Queue: Defense @@ -734,7 +713,6 @@ BRIK: Value: 0 Tooltip: Name: Concrete Barrier - Icon:brikicnh Description: Stop units and blocks enemy fire. Buildable: Queue: Defense diff --git a/mods/cnc/rules/tech.yaml b/mods/cnc/rules/tech.yaml index 174de04d59..2bbc406fc2 100644 --- a/mods/cnc/rules/tech.yaml +++ b/mods/cnc/rules/tech.yaml @@ -85,7 +85,6 @@ MISS: Dimensions: 3,2 Tooltip: Name: Tech Center - Icon: missicnh Buildable: Queue: Building BuildPaletteOrder: 1000 diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml index fa5a5f5b0e..b0c4050320 100644 --- a/mods/cnc/rules/vehicles.yaml +++ b/mods/cnc/rules/vehicles.yaml @@ -4,7 +4,6 @@ MCV: Cost: 2000 Tooltip: Name: Mobile Construction Vehicle - Icon: mcvicnh Description: Deploys into another Construction Yard.\n Unarmed Buildable: BuildPaletteOrder: 100 @@ -45,7 +44,6 @@ HARV: Cost: 1200 Tooltip: Name: Harvester - Icon: harvicnh Description: Collects Tiberium for processing.\n Unarmed Buildable: BuildPaletteOrder: 10 @@ -83,7 +81,6 @@ APC: Cost: 600 Tooltip: Name: APC - Icon: apcicnh Description: Armored infantry transport and mobile AA\n Strong vs Aircraft, Vehicles\n Weak vs Infantry Buildable: BuildPaletteOrder: 30 @@ -132,7 +129,6 @@ ARTY: Cost: 600 Tooltip: Name: Artillery - Icon:artyicnh Description: Long-range artillery.\n Strong vs Infantry, Vehicles\n Weak vs Tanks, Aircraft Buildable: BuildPaletteOrder: 60 @@ -167,7 +163,6 @@ FTNK: Cost: 800 Tooltip: Name: Flame Tank - Icon: ftnkicnh Description: Heavily armored flame-throwing vehicle.\n Strong vs Infantry, Buildings, Vehicles\n Weak vs Aircraft Buildable: BuildPaletteOrder: 50 @@ -201,7 +196,6 @@ BGGY: Cost: 300 Tooltip: Name: Nod Buggy - Icon: bggyicnh Description: Fast scout & anti-infantry vehicle.\n Strong vs Infantry, Vehicles\n Weak vs Tanks, Aircraft Buildable: BuildPaletteOrder: 20 @@ -236,7 +230,6 @@ BIKE: Cost: 500 Tooltip: Name: Recon Bike - Icon: bikeicnh Description: Fast scout vehicle, armed with \nrockets.\n Strong vs Vehicles, Aircraft\n Weak vs Infantry Buildable: BuildPaletteOrder: 30 @@ -274,7 +267,6 @@ JEEP: Cost: 400 Tooltip: Name: Hum-Vee - Icon: jeepicnh Description: Fast scout & anti-infantry vehicle.\n Strong vs Infantry, Vehicles\n Weak vs Tanks, Aircraft Buildable: BuildPaletteOrder: 20 @@ -309,7 +301,6 @@ LTNK: Cost: 600 Tooltip: Name: Light Tank - Icon: ltnkicnh Description: Fast, light tank.\n Strong vs Vehicles, Tanks\n Weak vs Infantry, Aircraft Buildable: BuildPaletteOrder: 40 @@ -348,7 +339,6 @@ MTNK: Cost: 800 Tooltip: Name: Med. Tank - Icon: mtnkicnh Description: General-Purpose GDI Tank.\n Strong vs Tanks, Vehicles\n Weak vs Infantry, Aircraft Buildable: BuildPaletteOrder: 40 @@ -388,7 +378,6 @@ HTNK: Cost: 1500 Tooltip: Name: Mammoth Tank - Icon: htnkicnh Description: Heavily armored GDI Tank.\n Strong vs Everything Buildable: BuildPaletteOrder: 60 @@ -440,7 +429,6 @@ MSAM: Cost: 1200 Tooltip: Name: MLRS - Icon: msamicnh Description: Long range rocket artillery.\n Strong vs all ground units. Buildable: BuildPaletteOrder: 50 @@ -475,7 +463,6 @@ MLRS: Cost: 600 Tooltip: Name: Mobile S.A.M. - Icon: mlrsicnh Description: Powerful anti-air unit.\nCannot attack ground units. Buildable: BuildPaletteOrder: 70 @@ -516,7 +503,6 @@ STNK: Cost: 900 Tooltip: Name: Stealth Tank - Icon: stnkicnh Description: Long-range missile tank that can cloak.\nHas weak armor. Can be spotted by infantry.\n Strong vs Vehicles, Tanks, Aircraft\n Weak vs Infantry. Buildable: BuildPaletteOrder: 90 @@ -554,7 +540,6 @@ MHQ: Cost: 1000 Tooltip: Name: Mobile HQ - Icon: mhqicnh Description: Base of operations Health: HP: 200 diff --git a/mods/cnc/sequences/aircraft.yaml b/mods/cnc/sequences/aircraft.yaml index 369ff97360..ce1e5e54a0 100644 --- a/mods/cnc/sequences/aircraft.yaml +++ b/mods/cnc/sequences/aircraft.yaml @@ -2,6 +2,8 @@ c17: idle: Start: 0 Facings: 32 + icon: c17iconh + Start: 0 tran: idle: @@ -24,6 +26,8 @@ tran: Length: 4 unload: Start: 35 + icon: tranicnh + Start: 0 heli: idle: @@ -39,6 +43,9 @@ heli: Start: 0 Length: 6 Facings: 8 + icon: heliicnh + Start: 0 + orca: idle: Start: 0 @@ -46,8 +53,12 @@ orca: damaged-idle: Start: 32 Facings: 32 + icon: orcaicnh + Start: 0 a10: idle: Start: 0 - Facings: 32 \ No newline at end of file + Facings: 32 + icon: a10icnh + Start: 0 \ No newline at end of file diff --git a/mods/cnc/sequences/campaign.yaml b/mods/cnc/sequences/campaign.yaml index 9053b858f7..075db1aeaf 100644 --- a/mods/cnc/sequences/campaign.yaml +++ b/mods/cnc/sequences/campaign.yaml @@ -34,4 +34,6 @@ boat: wake-right: wake Start: 0 Length: 6 - Offset: -1,2 \ No newline at end of file + Offset: -1,2 + icon: boaticnh + Start: 0 \ No newline at end of file diff --git a/mods/cnc/sequences/funpark.yaml b/mods/cnc/sequences/funpark.yaml index e873e99f79..a2e280c35d 100644 --- a/mods/cnc/sequences/funpark.yaml +++ b/mods/cnc/sequences/funpark.yaml @@ -31,6 +31,8 @@ steg: die6: Start: 176 Length: 22 + icon: stegicnh + Start: 0 trex: stand: @@ -65,6 +67,8 @@ trex: die6: Start: 144 Length: 40 + icon: trexicnh + Start: 0 tric: stand: @@ -99,6 +103,8 @@ tric: die6: Start: 176 Length: 20 + icon: tricicnh + Start: 0 rapt: stand: @@ -132,4 +138,6 @@ rapt: Length: 40 die6: Start: 144 - Length: 40 \ No newline at end of file + Length: 40 + icon: rapticnh + Start: 0 \ No newline at end of file diff --git a/mods/cnc/sequences/infantry.yaml b/mods/cnc/sequences/infantry.yaml index 9291ea3664..105fe23b19 100644 --- a/mods/cnc/sequences/infantry.yaml +++ b/mods/cnc/sequences/infantry.yaml @@ -6,6 +6,9 @@ vice: Start: 0 Length: 13 Facings: 8 + icon: viceicnh + Start: 0 + pvice: idle: Start: 0 @@ -14,6 +17,9 @@ pvice: Start: 0 Length: 13 Facings: 8 + icon: viceicnh + Start: 0 + e1: stand: Start: 0 @@ -109,6 +115,8 @@ e1: Start: 16 Length: 4 Tick: 1600 + icon: e1icnh + Start: 0 e2: stand: @@ -196,6 +204,8 @@ e2: Start: 16 Length: 4 Tick: 1600 + icon: e2icnh + Start: 0 e3: stand: @@ -283,6 +293,8 @@ e3: Start: 16 Length: 4 Tick: 1600 + icon: e3icnh + Start: 0 e4: stand: @@ -374,6 +386,9 @@ e4: Start: 0 Length: 13 Facings: 8 + icon: e4icnh + Start: 0 + e5: stand: Start: 0 @@ -464,6 +479,9 @@ e5: Start: 0 Length: 13 Facings: 8 + icon: e5icnh + Start: 0 + e6: stand: Start: 0 @@ -542,6 +560,9 @@ e6: Start: 16 Length: 4 Tick: 1600 + icon: e6icnh + Start: 0 + rmbo: stand: Start: 0 @@ -632,3 +653,5 @@ rmbo: Start: 16 Length: 4 Tick: 1600 + icon: rmboicnh + Start: 0 \ No newline at end of file diff --git a/mods/cnc/sequences/map.yaml b/mods/cnc/sequences/map.yaml index e6a6f3419c..94cc0a1d8c 100644 --- a/mods/cnc/sequences/map.yaml +++ b/mods/cnc/sequences/map.yaml @@ -734,6 +734,8 @@ miss: Start: 0 Length: * Tick: 80 + icon: missicnh + Start: 0 miss.husk: idle: miss diff --git a/mods/cnc/sequences/structures.yaml b/mods/cnc/sequences/structures.yaml index eb8fa9b1bf..0fa5404bac 100644 --- a/mods/cnc/sequences/structures.yaml +++ b/mods/cnc/sequences/structures.yaml @@ -24,6 +24,8 @@ fact: bib: bib2 Start: 0 Length: * + icon: facticnh + Start: 0 nuke: idle: @@ -44,6 +46,8 @@ nuke: bib: bib3 Start: 0 Length: * + icon: nukeicnh + Start: 0 proc: idle: @@ -71,6 +75,8 @@ proc: bib: bib2 Start: 0 Length: * + icon: procicnh + Start: 0 silo: idle: @@ -88,6 +94,8 @@ silo: bib: bib3 Start: 0 Length: * + icon: siloicnh + Start: 0 hand: idle: @@ -103,6 +111,8 @@ hand: bib: bib3 Start: 0 Length: * + icon: handicnh + Start: 0 pyle: idle: @@ -123,6 +133,8 @@ pyle: bib: bib3 Start: 0 Length: * + icon: pyleicnh + Start: 0 weap: idle: @@ -148,6 +160,8 @@ weap: bib: bib2 Start: 0 Length: * + icon: weapicnh + Start: 0 afld: idle: @@ -178,6 +192,8 @@ afld: bib: bib1 Start: 0 Length: * + icon: afldicnh + Start: 0 hq: idle: @@ -197,6 +213,8 @@ hq: bib: bib3 Start: 0 Length: * + icon: hqicnh + Start: 0 nuk2: idle: @@ -216,6 +234,8 @@ nuk2: bib: bib3 Start: 0 Length: * + icon: nuk2icnh + Start: 0 hpad: idle: @@ -241,6 +261,8 @@ hpad: Start: 0 Length: * Tick: 80 + icon: hpadicnh + Start: 0 fix: idle: @@ -263,6 +285,8 @@ fix: Start: 0 Length: 14 Tick: 60 + icon: fixicnh + Start: 0 eye: idle: @@ -282,6 +306,8 @@ eye: bib: bib3 Start: 0 Length: * + icon: eyeicnh + Start: 0 tmpl: idle: @@ -303,6 +329,8 @@ tmpl: bib: bib2 Start: 0 Length: * + icon: tmplicnh + Start: 0 obli: idle: @@ -321,6 +349,8 @@ obli: Start: 0 Length: 13 Tick: 80 + icon: obliicnh + Start: 0 brik: idle: @@ -335,6 +365,8 @@ brik: critical-idle: Start: 48 Length: 16 + icon: brikicnh + Start: 0 sbag: idle: @@ -343,6 +375,8 @@ sbag: damaged-idle: Start: 16 Length: 16 + icon: sbagicnh + Start: 0 cycl: idle: @@ -354,6 +388,8 @@ cycl: critical-idle: Start: 32 Length: 16 + icon: cyclicnh + Start: 0 barb: idle: @@ -391,6 +427,8 @@ gun: muzzle: gunfire2 Start: 0 Length: * + icon: gunicnh + Start: 0 sam: closed-idle: @@ -429,6 +467,9 @@ sam: Start: 0 Length: 18 Facings: 8 + icon: samicnh + Start: 0 + gtwr: idle: Start: 0 @@ -444,6 +485,8 @@ gtwr: Start: 0 Length: 6 Facings: 8 + icon: gtwricnh + Start: 0 atwr: idle: @@ -459,4 +502,5 @@ atwr: muzzle: gunfire2 Start: 0 Length: * - + icon: atwricnh + Start: 0 \ No newline at end of file diff --git a/mods/cnc/sequences/vehicles.yaml b/mods/cnc/sequences/vehicles.yaml index 03943a467b..0a738cf4bc 100644 --- a/mods/cnc/sequences/vehicles.yaml +++ b/mods/cnc/sequences/vehicles.yaml @@ -2,6 +2,8 @@ mcv: idle: Start: 0 Facings: 32 + icon: mcvicnh + Start: 0 harv: idle: @@ -18,6 +20,8 @@ harv: dock-loop: harvdump Start: 7 Length: 1 + icon: harvicnh + Start: 0 bggy: idle: @@ -30,6 +34,8 @@ bggy: Start: 0 Length: 6 Facings: 8 + icon: bggyicnh + Start: 0 mtnk: idle: @@ -41,6 +47,8 @@ mtnk: muzzle: gunfire2 Start: 0 Length: * + icon: mtnkicnh + Start: 0 ltnk: idle: @@ -52,6 +60,8 @@ ltnk: muzzle: gunfire2 Start: 0 Length: * + icon: ltnkicnh + Start: 0 htnk: idle: @@ -63,6 +73,8 @@ htnk: muzzle: gunfire2 Start: 0 Length: * + icon: htnkicnh + Start: 0 jeep: idle: @@ -75,11 +87,15 @@ jeep: Start: 0 Length: 6 Facings: 8 + icon: jeepicnh + Start: 0 bike: idle: Start: 0 Facings: 32 + icon: bikeicnh + Start: 0 ftnk: idle: @@ -89,6 +105,8 @@ ftnk: Start: 0 Length: 13 Facings: 8 + icon: ftnkicnh + Start: 0 mhq: idle: @@ -97,6 +115,8 @@ mhq: spinner: Start: 32 Length: 32 + icon: mhqicnh + Start: 0 msam: idle: @@ -111,6 +131,8 @@ msam: turret-3: Start: 64 Facings: 32 + icon: msamicnh + Start: 0 mlrs: idle: @@ -125,11 +147,15 @@ mlrs: turret-3: Start: 96 Facings: 32 + icon: mlrsicnh + Start: 0 stnk: idle: Start: 0 Facings: 32 + icon: stnkicnh + Start: 0 arty: idle: @@ -138,6 +164,8 @@ arty: muzzle: gunfire2 Start: 0 Length: * + icon: artyicnh + Start: 0 apc: idle: @@ -155,4 +183,6 @@ apc: Start: 32 Length: 3 unload: - Start: 32 \ No newline at end of file + Start: 32 + icon: apcicnh + Start: 0 \ No newline at end of file diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml index ff46bdb260..132e5ffb12 100644 --- a/mods/d2k/rules/aircraft.yaml +++ b/mods/d2k/rules/aircraft.yaml @@ -5,7 +5,6 @@ Tooltip: Name: Carryall Description: Fast drop ship.\n Unarmed - Icon: carryallicon Health: HP: 250 Armor: @@ -17,7 +16,7 @@ ROT: 4 Speed: 30 LandableTerrainTypes: Sand, Rock, Transition, Spice, Dune - RepairBuildings: repair + RepairBuildings: repaira,repairo,repairh RearmBuildings: starporta,starporto,starporth LandAltitude: 800 RenderUnit: @@ -42,7 +41,7 @@ FRIGATE: Plane: ROT: 5 Speed: 50 - RepairBuildings: repair + RepairBuildings: repaira,repairo,repairh RearmBuildings: starporta,starporto,starporth Health: HP: 500 @@ -85,7 +84,7 @@ ORNI: InitialFacing: 20 ROT: 6 Speed: 40 - RepairBuildings: repair + RepairBuildings: repaira,repairo,repairh RearmBuildings: starporta,starporto,starporth RenderUnit: WithShadow: @@ -108,7 +107,7 @@ ORNI.bomber: Plane: ROT: 5 Speed: 50 - RepairBuildings: repair + RepairBuildings: repaira,repairo,repairh RearmBuildings: starporta,starporto,starporth LimitedAmmo: Ammo: 5 @@ -137,7 +136,7 @@ CARRYALL.infantry: Plane: ROT: 4 Speed: 40 - RepairBuildings: repair + RepairBuildings: repaira,repairo,repairh RearmBuildings: starporta,starporto,starporth RenderUnit: Image: carryall @@ -169,7 +168,7 @@ CARRYALL.Husk: Helicopter: ROT: 4 Speed: 30 - RepairBuildings: repair + RepairBuildings: repaira,repairo,repairh RearmBuildings: starporta,starporto,starporth RenderUnit: Image: carryall @@ -182,7 +181,7 @@ ORNI.Husk: Helicopter: ROT: 6 Speed: 40 - RepairBuildings: repair + RepairBuildings: repaira,repairo,repairh RearmBuildings: starporta,starporto,starporth RenderUnit: Image: orni @@ -195,7 +194,7 @@ ORNI.bomber.Husk: Plane: ROT: 5 Speed: 50 - RepairBuildings: repair + RepairBuildings: repaira,repairo,repairh RearmBuildings: starporta,starporto,starporth RenderUnit: Image: orni @@ -208,7 +207,7 @@ CARRYALL.infantry.Husk: Plane: ROT: 4 Speed: 40 - RepairBuildings: repair + RepairBuildings: repaira,repairo,repairh RearmBuildings: starporta,starporto,starporth RenderUnit: Image: carryall @@ -221,7 +220,7 @@ BADR.Husk: Plane: ROT: 4 Speed: 40 - RepairBuildings: repair + RepairBuildings: repaira,repairo,repairh RearmBuildings: starporta,starporto,starporth RenderUnit: Image: carryall diff --git a/mods/d2k/rules/atreides.yaml b/mods/d2k/rules/atreides.yaml index d62f871944..5f7a328a2b 100644 --- a/mods/d2k/rules/atreides.yaml +++ b/mods/d2k/rules/atreides.yaml @@ -22,6 +22,15 @@ BARRA: Buildable: Owner: atreides +REPAIRA: + Inherits: ^REPAIR + Buildable: + Owner: atreides + +RESEARCHA: + Inherits: ^RESEARCH + Buildable: + Owner: atreides HIGHTECHA: Inherits: ^HIGHTECH @@ -92,21 +101,6 @@ MCVA.starport: Valued: Cost: 2500 -TRIKEA: - Inherits: ^TRIKE - Buildable: - Owner: atreides, harkonnen - RenderUnit: - Image: TRIKE - -TRIKEA.starport: - Inherits: TRIKEA - Buildable: - Owner: atreides, harkonnen, ordos - Queue: Starport - Valued: - Cost: 315 - CARRYALLA: Inherits: ^CARRYALL RenderUnit: @@ -119,8 +113,6 @@ CARRYALLA.starport: COMBATA: Inherits: ^COMBAT - Tooltip: - Icon: combataicon Buildable: Owner: atreides RevealsShroud: @@ -141,8 +133,6 @@ COMBATA: COMBATA.Husk: Inherits: ^COMBAT.Husk - Tooltip: - Icon: combataicon RenderUnit: Image: COMBATA @@ -166,7 +156,6 @@ SONICTANK: Tooltip: Name: Sonic Tank Description: Fires sonic shocks\n Strong vs Infantry, Vehicles\n Weak vs Artillery, Aircraft - Icon: sonictankicon Selectable: Bounds: 30,30 Health: @@ -193,8 +182,6 @@ SONICTANK: SONICTANK.Husk: Inherits: ^Husk - Tooltip: - Icon: sonictankicon RenderUnit: Image: SONICTANK diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml index 367d800a60..8e62a908b6 100644 --- a/mods/d2k/rules/defaults.yaml +++ b/mods/d2k/rules/defaults.yaml @@ -32,6 +32,7 @@ DebugMuzzlePositions: Guard: Guardable: + RenderUnit: BodyOrientation: UpdatesPlayerStatistics: @@ -65,10 +66,11 @@ Types:Tank GivesBounty: Repairable: - RepairBuildings: repair + RepairBuildings: repaira,repairo,repairh DebugMuzzlePositions: Guard: Guardable: + RenderUnit: BodyOrientation: UpdatesPlayerStatistics: diff --git a/mods/d2k/rules/harkonnen.yaml b/mods/d2k/rules/harkonnen.yaml index 0bc3b78092..f81561214c 100644 --- a/mods/d2k/rules/harkonnen.yaml +++ b/mods/d2k/rules/harkonnen.yaml @@ -23,6 +23,16 @@ BARRH: Owner: harkonnen -RepairsUnits: +REPAIRH: + Inherits: ^REPAIR + Buildable: + Owner: harkonnen + +RESEARCHH: + Inherits: ^RESEARCH + Buildable: + Owner: harkonnen + SILOH: Inherits: ^SILO Buildable: @@ -97,38 +107,6 @@ MCVH.starport: Valued: Cost: 2500 -#TRIKEH: -# Inherits: ^TRIKE -# Buildable: -# Owner: harkonnen -# Valued: -# Cost: 250 -# Tooltip: -# Name: Scout Quad -# Description: Heavy Scout\n Strong vs Infantry -# Icon: quadicon -# Health: -# HP: 125 -# Mobile: -# ROT: 9 -# Speed: 11 -# Armament: -# Weapon: M60mg -# LocalOffset: 43,0,128 -# AttackFrontal: -# RenderUnit: -# Image: QUAD - -#TRIKEH.starport: -# Inherits: ^TRIKE -# Buildable: -# Owner: harkonnen -# Queue: Starport -# Valued: -# Cost: 149 -# RenderUnit: -# Image: TRIKE - CARRYALLH: Inherits: ^CARRYALL RenderUnit: @@ -139,16 +117,8 @@ CARRYALLH.starport: Valued: Cost: 1500 -QUADH: - Inherits: QUAD - Buildable: - -Prerequisites: - Owner: harkonnen - COMBATH: Inherits: ^COMBAT - Tooltip: - Icon: combathicon Buildable: Owner: harkonnen Mobile: @@ -166,8 +136,6 @@ COMBATH: COMBATH.Husk: Inherits: ^COMBAT.Husk - Tooltip: - Icon: combathicon RenderUnit: Image: COMBATH @@ -183,7 +151,7 @@ DEVAST: Buildable: Queue: Armor BuildPaletteOrder: 100 - Prerequisites: Ix + Prerequisites: Research Owner: harkonnen Hotkey: d Valued: @@ -191,7 +159,6 @@ DEVAST: Tooltip: Name: Devastator Description: Super Heavy Tank\n Strong vs Tanks\n Weak vs Artillery, Aircraft - Icon: devasticon Health: HP: 650 Armor: @@ -220,8 +187,6 @@ DEVAST.Husk: Inherits: ^Husk Health: HP: 125 - Tooltip: - Icon: devasticon RenderUnit: Image: DEVAST diff --git a/mods/d2k/rules/infantry.yaml b/mods/d2k/rules/infantry.yaml index 0ace1ddb48..3d357dd673 100644 --- a/mods/d2k/rules/infantry.yaml +++ b/mods/d2k/rules/infantry.yaml @@ -91,7 +91,6 @@ MEDIC: Tooltip: Name: Medic Description: Heals nearby infantry\n Strong vs Nothing\n Weak vs Everything - Icon: thumpericon Selectable: Bounds: 12,17,0,0 Voice: EngineerVoice @@ -108,59 +107,4 @@ MEDIC: PipType: Blue -AutoTarget: AttackMove: - JustMove: true - RenderInfantry: - Image: THUMPER - - -#THUMPER: -# Inherits: ^Infantry -# Buildable: -# Queue: Infantry -# BuildPaletteOrder: 50 -# Owner: atreides,harkonnen,ordos -# Valued: -# Cost: 400 -# Tooltip: -# Name: Thumper -# Description: Attracts sandsworm through vibrations\n Strong vs Nothing\n Weak vs Everything -# Selectable: -# Bounds: 12,17,0,0 -# Health: -# HP: 25 -# Mobile: -# Speed: 4 -# Passenger: -# -AutoTarget: -# AttackMove: -# JustMove: true -# Transforms: -# IntoActor: thumping -# Offset:1,1 -# Facing: 1 -# -#THUMPING: -# Inherits: ^Building -# Building: -# Power: 0 -# Footprint: x -# Dimensions: 1,1 -# TerrainTypes: Sand, Dune -# Health: -# HP: 25 -# Armor: -# Type: None -# RevealsShroud: -# Range: 5 -# Valued: -# Cost: 400 -# Tooltip: -# Name: Thumper -# -Capturable: -# -CapturableBar: -# -Sellable: -# -GivesBuildableArea: -# FreeActor: -# Actor: SANDWORM -# SpawnOffset: 1,2 -# Facing: 1 + JustMove: true \ No newline at end of file diff --git a/mods/d2k/rules/ordos.yaml b/mods/d2k/rules/ordos.yaml index f3c40c0a16..2afd63f80e 100644 --- a/mods/d2k/rules/ordos.yaml +++ b/mods/d2k/rules/ordos.yaml @@ -22,6 +22,16 @@ BARRO: Buildable: Owner: ordos +REPAIRO: + Inherits: ^REPAIR + Buildable: + Owner: ordos + +RESEARCHO: + Inherits: ^RESEARCH + Buildable: + Owner: ordos + SILOO: Inherits: ^SILO Buildable: @@ -93,8 +103,6 @@ MCVO.starport: COMBATO: Inherits: ^COMBAT - Tooltip: - Icon: combatoicon Buildable: Owner: ordos RevealsShroud: @@ -113,8 +121,6 @@ COMBATO: COMBATO.Husk: Inherits: ^COMBAT.Husk - Tooltip: - Icon: combatoicon RenderUnit: Image: COMBATO @@ -125,31 +131,44 @@ COMBATO.starport: Valued: Cost: 875 -TRIKEO: - Inherits: ^TRIKE +RAIDER: + Inherits: ^Vehicle Buildable: + Queue: Vehicle + BuildPaletteOrder: 10 + Hotkey: w Owner: ordos Valued: Cost: 300 Tooltip: Name: Raider Trike Description: Improved Scout\n Strong vs Infantry, Light Vehicles - Icon: raidericon + Selectable: + Bounds: 24,24 Health: HP: 110 + Armor: + Type: Light Mobile: ROT: 10 Speed: 14 + RevealsShroud: + Range: 7 RenderUnit: - Image: RAIDER + WithMuzzleFlash: Armament: Weapon: HMGo LocalOffset: 256,0,128 AttackFrontal: + AutoTarget: + Explodes: + Weapon: UnitExplodeTiny + EmptyWeapon: UnitExplodeTiny -STEALTHTRIKE: - Inherits: ^TRIKE +STEALTHRAIDER: + Inherits: ^Vehicle Buildable: + Queue: Vehicle Prerequisites: Hitech Owner: ordos BuildPaletteOrder: 30 @@ -158,18 +177,26 @@ STEALTHTRIKE: Tooltip: Name: Stealth Raider Trike Description: Invisible Raider Trike\n Strong vs Infantry, Light Vehicles - Icon: raidersicon + Selectable: + Bounds: 24,24 Health: HP: 110 + Armor: + Type: Light Mobile: ROT: 10 Speed: 14 + RevealsShroud: + Range: 7 RenderUnit: - Image: RAIDER + WithMuzzleFlash: Armament: Weapon: HMGo LocalOffset: 256,0,128 AttackFrontal: + Explodes: + Weapon: UnitExplodeTiny + EmptyWeapon: UnitExplodeTiny Cloak: InitialDelay: 45 CloakDelay: 90 @@ -178,16 +205,6 @@ STEALTHTRIKE: AutoTarget: InitialStance: HoldFire -#TRIKEO.starport: -# Inherits: ^TRIKE -# Buildable: -# Queue: Starport -# Owner: ordos -# RenderUnit: -# Image: TRIKE -# Valued: -# Cost: 149 - CARRYALLO: Inherits: ^CARRYALL RenderUnit: @@ -205,7 +222,6 @@ DEVIATORTANK: Tooltip: Name: Deviator Description: Causes no actual damage\nFires a warhead which changes allegiances\n but does not effect buildings or tanks - Icon: deviatortankicon Buildable: Queue: Armor BuildPaletteOrder: 50 @@ -238,8 +254,6 @@ DEVIATORTANK: DEVIATORTANK.Husk: Inherits: ^Husk - Tooltip: - Icon: deviatortankicon RenderUnit: Image: DEVIATORTANK diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index ecc9d08a54..16cda12cd0 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -330,12 +330,15 @@ Prerequisite: Starport WALL: + Inherits: ^WALL + Buildable: + Owner: + +^WALL: Buildable: Queue: Building Prerequisites: Barracks - Owner: atreides, harkonnen, ordos BuildPaletteOrder: 60 - #Hotkey: g SoundOnDamageTransition: DamagedSound: DestroyedSound: EXPLSML4.WAV @@ -346,7 +349,6 @@ WALL: Tooltip: Name: Concrete Wall Description: Stop units and blocks enemy fire. - Icon: wallaicon AppearsOnRadar: Building: BuildSounds: CHUNG.WAV @@ -361,15 +363,14 @@ WALL: CrushClasses: Concretewall LineBuild: Range: 8 - #SelectionDecorations: - #Selectable: - # Priority: 1 +# SelectionDecorations: +# Selectable: +# Priority: 1 TargetableBuilding: TargetTypes: Ground, C4 RenderBuildingWall: HasMakeAnimation: false Image: walla - #GivesExperience: EditorAppearance: RelativeToTopLeft: yes AutoTargetIgnore: @@ -379,12 +380,11 @@ WALL: Guardable: BodyOrientation: -GUNTOWER: +^GUNTOWER: Inherits: ^Building Buildable: Queue: Building Prerequisites: Barracks - Owner: atreides, harkonnen, ordos BuildPaletteOrder: 90 Hotkey: g Valued: @@ -392,7 +392,6 @@ GUNTOWER: Tooltip: Name: Gun Tower Description: Defensive structure\n Strong vs Tanks\n Weak vs Infantry, Aircraft - Icon: guntoweraicon Building: Power: -20 Adjacent: 4 @@ -421,26 +420,15 @@ GUNTOWER: LocalOffset: 469,0,299 AttackTurreted: AutoTarget: - LeavesHusk: - HuskActor: Guntower.Husk RenderDetectionCircle: DetectCloaked: Range: 5 -GUNTOWER.Husk: - Inherits: ^TowerHusk - Tooltip: - Name: Destroyed Tower - Icon: guntoweraicon - RenderUnit: - Image: guntowera - -ROCKETTOWER: +^ROCKETTOWER: Inherits: ^Building Buildable: Queue: Building Prerequisites: Outpost - Owner: atreides, harkonnen, ordos BuildPaletteOrder: 120 Hotkey: m Valued: @@ -448,7 +436,6 @@ ROCKETTOWER: Tooltip: Name: Rocket Tower Description: Defensive structure\n Strong vs Infantry, Aircraft\n Weak vs Tanks\n\n Requires power to operate - Icon: rockettoweraicon Building: Power: -30 Adjacent: 4 @@ -467,7 +454,6 @@ ROCKETTOWER: RenderRangeCircle: RenderBuilding: HasMakeAnimation: false - Image: rockettowera WithTurret: Armament: Weapon: TowerMissile @@ -479,26 +465,15 @@ ROCKETTOWER: AutoTarget: RequiresPower: CanPowerDown: - LeavesHusk: - HuskActor: Rockettower.Husk RenderDetectionCircle: DetectCloaked: Range: 6 -ROCKETTOWER.Husk: - Inherits: ^TowerHusk - Tooltip: - Name: Destroyed Tower - Icon: rockettoweraicon - RenderUnit: - Image: rockettowera - -REPAIR: +^REPAIR: Inherits: ^Building Buildable: Queue: Building Prerequisites: Heavy - Owner: atreides, harkonnen, ordos BuildPaletteOrder: 130 Hotkey: e Valued: @@ -506,7 +481,6 @@ REPAIR: Tooltip: Name: Repair Pad Description: Repairs vehicles\n Allows construction of MCVs - Icon: repairaicon Building: Power: -10 Footprint: =x= =x= === @@ -523,8 +497,8 @@ REPAIR: ValuePercentage: 50 RallyPoint: RallyPoint: 1,3 - RenderBuilding: - Image: repaira + ProvidesCustomPrerequisite: + Prerequisite: Repair ^HIGHTECH: Inherits: ^Building @@ -554,12 +528,11 @@ REPAIR: ProvidesCustomPrerequisite: Prerequisite: Hitech -RESEARCH: +^RESEARCH: Inherits: ^Building Buildable: Queue: Building Prerequisites: Hitech - Owner: atreides, harkonnen, ordos BuildPaletteOrder: 140 Hotkey: v Selectable: @@ -569,7 +542,6 @@ RESEARCH: Tooltip: Name: IX Research Center Description: Unlocks experimental tanks\n Special Ability: Carryall Combat Drop - Icon: researchaicon ParatroopersPower: Image: carryallicon UnitType: carryall.infantry @@ -593,14 +565,12 @@ RESEARCH: RevealsShroud: Range: 4 ProvidesCustomPrerequisite: - Prerequisite: Ix - RenderBuilding: - Image: researcha + Prerequisite: Research ^PALACE: Inherits: ^Building Buildable: - Prerequisites: Ix + Prerequisites: Research Queue: Building BuildPaletteOrder: 150 Hotkey: p @@ -626,7 +596,7 @@ RESEARCH: DetectCloaked: Range: 4 ProvidesCustomPrerequisite: - Prerequisite: TPal + Prerequisite: Palace SIETCH: Inherits: ^Building @@ -689,6 +659,10 @@ HITECH: Tooltip: Name: High-Tech Facility -IX: +REPAIR: Tooltip: - Name: IX Research Center + Name: Repair Pad + +RESEARCH: + Tooltip: + Name: Ix Research Center diff --git a/mods/d2k/rules/system.yaml b/mods/d2k/rules/system.yaml index 076c3e9da2..04285a6fea 100644 --- a/mods/d2k/rules/system.yaml +++ b/mods/d2k/rules/system.yaml @@ -117,9 +117,7 @@ Player: fremen: 0.5% sardaukar: 1.5% harvester: 0.1% - trikea.starport: 5% - #trikeh.starport: 5% - #trikeo.starport: 5% + trike.starport: 5% quad.starport: 7.5% siegetank.starport: 5% missiletank.starport: 7.5% @@ -129,9 +127,7 @@ Player: sonictank: 10% devast: 10% deviatortank: 7.5% - trikea: 10% - #trikeh: 10% - trikeo: 10% + trike: 10% quad: 15% siegetank: 10% missiletank: 15% @@ -180,9 +176,7 @@ Player: fremen: 0.25% sardaukar: 1% harvester: 0.1% - trikea.starport: 7.5% - #trikeh.starport: 7.5% - #trikeo.starport: 7.5% + trike.starport: 7.5% quad.starport: 12.5% siegetank.starport: 5% missiletank.starport: 7.5% @@ -192,9 +186,8 @@ Player: sonictank: 10% devast: 10% deviatortank: 7.5% - trikea: 15% - #trikeh: 15% - trikeo: 15% + trike: 15% + raider: 15% quad: 25% siegetank: 10% missiletank: 15% @@ -241,9 +234,7 @@ Player: fremen: 1% sardaukar: 3% harvester: 0.1% - trikea.starport: 5% - #trikeh.starport: 5% - #trikeo.starport: 5% + trike.starport: 5% quad.starport: 7.5% siegetank.starport: 5% missiletank.starport: 7.5% @@ -253,9 +244,8 @@ Player: sonictank: 10% devast: 10% deviatortank: 7.5% - trikea: 10% - #trikeh: 10% - trikeo: 10% + trike: 10% + raider: 10% quad: 15% siegetank: 10% missiletank: 15% @@ -413,12 +403,12 @@ CRATE: Amount: 1500 SelectionShares: 25 UseCashTick: yes - GiveUnitCrateAction@TrikeA: + GiveUnitCrateAction@Trike: SelectionShares: 20 - Unit: trikea - GiveUnitCrateAction@TrikeO: + Unit: trike + GiveUnitCrateAction@Raider: SelectionShares: 15 - Unit: trikeo + Unit: raider GiveUnitCrateAction@Quad: SelectionShares: 40 Unit: quad @@ -437,9 +427,9 @@ CRATE: GiveUnitCrateAction@MissileTank: SelectionShares: 10 Unit: missiletank - GiveUnitCrateAction@StealthTrike: + GiveUnitCrateAction@StealthRaider: SelectionShares: 7 - Unit: stealthtrike + Unit: stealthraider GiveUnitCrateAction@Fremen: SelectionShares: 5 Unit: fremen diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml index 1386f7e212..b28089633b 100644 --- a/mods/d2k/rules/vehicles.yaml +++ b/mods/d2k/rules/vehicles.yaml @@ -10,7 +10,6 @@ Tooltip: Name: Mobile Construction Vehicle Description: Deploys into another Construction Yard\n Unarmed - Icon: mcvicon Selectable: Priority: 3 Bounds: 42,42 @@ -40,7 +39,6 @@ MCV.Husk: HP: 175 Tooltip: Name: Destroyed Mobile Construction Vehicle - Icon: missiletankicon RenderUnit: Image: DMCV @@ -57,7 +55,6 @@ HARVESTER: Tooltip: Name: Spice Harvester Description: Collects Spice for processing\n Unarmed - Icon: harvestericon Selectable: Priority: 7 Bounds: 42,42 @@ -96,7 +93,6 @@ HARVESTER.Husk: HP: 150 Tooltip: Name: Destroyed Spice Harvester - Icon: harvestericon RenderUnit: Image: HARVESTER @@ -108,18 +104,18 @@ HARVESTER.starport: Valued: Cost: 1500 -^TRIKE: +TRIKE: Inherits: ^Vehicle Buildable: Queue: Vehicle BuildPaletteOrder: 10 Hotkey: w + Owner: atreides, harkonnen Valued: Cost: 250 Tooltip: Name: Scout Trike Description: Fast Scout\n Strong vs Infantry - Icon: trikeicon Selectable: Bounds: 24,24 Health: @@ -141,18 +137,28 @@ HARVESTER.starport: Explodes: Weapon: UnitExplodeTiny EmptyWeapon: UnitExplodeTiny - #Cargo: - # Types: Infantry - # MaxWeight: 1 - # PipCount: 1 - # UnloadFacing: 220 +# Cargo: +# Types: Infantry +# MaxWeight: 1 +# PipCount: 1 +# UnloadFacing: 220 + +TRIKE.starport: + Inherits: TRIKE + Buildable: + Owner: atreides, harkonnen, ordos + Queue: Starport + Valued: + Cost: 315 + RenderUnit: + Image: TRIKE QUAD: Inherits: ^Vehicle Buildable: Queue: Vehicle Prerequisites: Light,Outpost - Owner: atreides, ordos + Owner: atreides, ordos, harkonnen BuildPaletteOrder: 20 Hotkey: q Valued: @@ -160,7 +166,6 @@ QUAD: Tooltip: Name: Missile Quad Description: Missile Scout\n Strong vs Vehicles\n Weak vs Infantry - Icon: quadicon Health: HP: 125 Armor: @@ -170,8 +175,6 @@ QUAD: Speed: 9 RevealsShroud: Range: 8 - RenderUnit: - Image: QUAD Armament: Weapon: QuadRockets LocalOffset: 128,0,85#-4 @@ -190,6 +193,8 @@ QUAD.starport: Queue: Starport Valued: Cost: 500 + RenderUnit: + Image: QUAD ^COMBAT: Inherits: ^Tank @@ -250,7 +255,6 @@ SIEGETANK: Tooltip: Name: Siege Tank Description: Siege Artillery\n Strong vs Infantry, Buildings\n Weak vs Tanks, Aircraft - Icon: siegetankicon Health: HP: 120 Armor: @@ -286,7 +290,6 @@ SIEGETANK: SIEGETANK.Husk: Inherits: ^Husk Tooltip: - Icon: siegetankicon ThrowsParticle@turret: Anim: turret RenderUnit: @@ -306,7 +309,6 @@ MISSILETANK: Tooltip: Name: Rocket Tank Description: Rocket Artillery\n Strong vs Vehicles, Buildings\n Weak vs Infantry, Aircraft - Icon: missiletankicon Buildable: Queue: Armor Prerequisites: Hitech @@ -341,8 +343,6 @@ MISSILETANK: MISSILETANK.Husk: Inherits: ^Husk - Tooltip: - Icon: missiletankicon RenderUnit: Image: MISSILETANK diff --git a/mods/d2k/sequences/infantry.yaml b/mods/d2k/sequences/infantry.yaml index a55ac588c8..7747737bbe 100644 --- a/mods/d2k/sequences/infantry.yaml +++ b/mods/d2k/sequences/infantry.yaml @@ -65,6 +65,9 @@ rifle: Start: 430 Length: 12 Tick: 1600 + icon: DATA.R8 + Start: 4011 + Offset: -30,-24 bazooka: stand: DATA.R8 @@ -133,6 +136,9 @@ bazooka: Start: 668 Length: 26 Tick: 1600 + icon: DATA.R8 + Start: 4012 + Offset: -30,-24 engineer: stand: DATA.R8 @@ -171,8 +177,11 @@ engineer: Start: 1376 Length: 26 Tick: 1600 + icon: DATA.R8 + Start: 4013 + Offset: -30,-24 -thumper: +medic: # actually thumper stand: DATA.R8 Start: 1402 Facings: -8 @@ -213,6 +222,9 @@ thumper: Start: 1577 Length: 26 Tick: 1600 + icon: DATA.R8 + Start: 4014 + Offset: -30,-24 thumping: idle: DATA.R8 @@ -226,6 +238,9 @@ thumping: Start: 1458 Length: 5 Tick: 150 + icon: DATA.R8 + Frames: 4014 + Offset: -30,-24 fremen: stand: DATA.R8 @@ -291,6 +306,9 @@ fremen: Start: 904 Length: 26 Tick: 1600 + icon: DATA.R8 + Start: 4032 + Offset: -30,-24 saboteur: stand: DATA.R8 @@ -350,6 +368,9 @@ saboteur: Start: 2359 Length: 26 Tick: 1600 + icon: DATA.R8 + Start: 4034 + Offset: -30,-24 sardaukar: stand: DATA.R8 @@ -415,3 +436,6 @@ sardaukar: Start: 1140 Length: 26 Tick: 1600 + icon: DATA.R8 + Start: 4015 + Offset: -30,-24 diff --git a/mods/d2k/sequences/structures.yaml b/mods/d2k/sequences/structures.yaml index 63aac8da31..bfb8c8e5b1 100644 --- a/mods/d2k/sequences/structures.yaml +++ b/mods/d2k/sequences/structures.yaml @@ -15,6 +15,9 @@ walla: Frames: 2543, 2546, 2544, 2554, 2547, 2548, 2558, 2551, 2545, 2555, 2549, 2550, 2556, 2552, 2553, 2557 Length: 16 Offset: -16,16 + icon: DATA.R8 + Start: 4063 + Offset: -30,-24 wallh: idle: DATA.R8 @@ -33,6 +36,9 @@ wallh: Frames: 2703, 2706, 2704, 2714, 2707, 2708, 2718, 2711, 2705, 2715, 2709, 2710, 2716, 2712, 2713, 2717 Length: 16 Offset: -16,16 + icon: DATA.R8 + Start: 4064 + Offset: -30,-24 wallo: idle: DATA.R8 @@ -51,6 +57,9 @@ wallo: Frames: 2863, 2866, 2864, 2874, 2867, 2868, 2878, 2871, 2865, 2875, 2869, 2870, 2876, 2872, 2873, 2877 Length: 16 Offset: -16,16 + icon: DATA.R8 + Start: 4065 + Offset: -30,-24 guntowera: idle: DATA.R8 @@ -73,6 +82,9 @@ guntowera: Start: 2589 Facings: -32 Offset: -24,24 + icon: DATA.R8 + Start: 4069 + Offset: -30,-24 guntowerh: idle: DATA.R8 @@ -95,6 +107,9 @@ guntowerh: Start: 2749 Facings: -32 Offset: -24,24 + icon: DATA.R8 + Frames: 4070 + Offset: -30,-24 guntowero: idle: DATA.R8 @@ -117,6 +132,9 @@ guntowero: Start: 2909 Facings: -32 Offset: -24,24 + icon: DATA.R8 + Start: 4071 + Offset: -30,-24 rockettowera: idle: DATA.R8 @@ -139,6 +157,9 @@ rockettowera: Start: 2637 Facings: -32 Offset: -24,24 + icon: DATA.R8 + Start: 4075 + Offset: -30,-24 rockettowerh: idle: DATA.R8 @@ -161,6 +182,9 @@ rockettowerh: Start: 2828 Facings: -32 Offset: -24,24 + icon: DATA.R8 + Start: 4076 + Offset: -30,-24 rockettowero: idle: DATA.R8 @@ -183,6 +207,9 @@ rockettowero: Start: 2988 Facings: -32 Offset: -24,24 + icon: DATA.R8 + Start: 4077 + Offset: -30,-24 conyarda: idle: DATA.R8 @@ -206,6 +233,9 @@ conyarda: bib: bib3x # TODO: read this from BLOXBAT.R8 Start: 0 Length: * + icon: DATA.R8 + Start: 4046 + Offset: -30,-24 repaira: make: DATA.R8 # TODO: overlay @@ -231,6 +261,9 @@ repaira: Start: 2572 Offset: -48,48 ZOffset: -1c511 + icon: DATA.R8 + Start: 4096 + Offset: -30,-24 repairh: make: DATA.R8 # TODO: overlay @@ -256,6 +289,9 @@ repairh: Start: 2732 Offset: -48,48 ZOffset: -1c511 + icon: DATA.R8 + Start: 4097 + Offset: -30,-24 repairo: make: DATA.R8 # TODO: overlay @@ -281,6 +317,9 @@ repairo: Start: 2892 Offset: -48,48 ZOffset: -1c511 + icon: DATA.R8 + Start: 4098 + Offset: -30,-24 starporta: idle: DATA.R8 @@ -307,6 +346,9 @@ starporta: bib: bib3x Start: 0 Length: * + icon: DATA.R8 + Start: 4092 + Offset: -30,-24 pwra: idle: DATA.R8 @@ -326,6 +368,9 @@ pwra: bib: bib2x Start: 0 Length: * + icon: DATA.R8 + Start: 4056 + Offset: -30,-24 barra: idle: DATA.R8 @@ -341,6 +386,9 @@ barra: bib: bib2x Start: 0 Length: * + icon: DATA.R8 + Start: 4059 + Offset: -30,-24 radara: idle: DATA.R8 @@ -360,6 +408,9 @@ radara: bib: bib3x Start: 0 Length: * + icon: DATA.R8 + Start: 4072 + Offset: -30,-24 refa: idle: DATA.R8 @@ -382,6 +433,9 @@ refa: bib: bib3x Start: 0 Length: * + icon: DATA.R8 + Start: 4066 + Offset: -30,-24 siloa: idle: DATA.R8 @@ -396,6 +450,9 @@ siloa: Start: 4313 Length: 14 Offset: -16,16 + icon: DATA.R8 + Start: 4084 + Offset: -30,-24 hightecha: idle: DATA.R8 @@ -415,6 +472,9 @@ hightecha: bib: bib3x Start: 0 Length: * + icon: DATA.R8 + Start: 4078 + Offset: -30,-24 researcha: idle: DATA.R8 @@ -434,6 +494,9 @@ researcha: bib: bib3x Start: 0 Length: * + icon: DATA.R8 + Start: 4099 + Offset: -30,-24 researchh: idle: DATA.R8 @@ -453,6 +516,9 @@ researchh: bib: bib3x Start: 0 Length: * + icon: DATA.R8 + Start: 4100 + Offset: -30,-24 researcho: idle: DATA.R8 @@ -472,6 +538,9 @@ researcho: bib: bib3x Start: 0 Length: * + icon: DATA.R8 + Start: 4101 + Offset: -30,-24 palacea: idle: DATA.R8 @@ -487,6 +556,9 @@ palacea: bib: bib3x Start: 0 Length: * + icon: DATA.R8 + Start: 4102 + Offset: -30,-24 lighta: idle: DATA.R8 @@ -521,6 +593,9 @@ lighta: bib: bib3x Start: 0 Length: * + icon: DATA.R8 + Start: 4081 + Offset: -30,-24 heavya: idle: DATA.R8 @@ -555,6 +630,9 @@ heavya: bib: bib3x Start: 0 Length: * + icon: DATA.R8 + Start: 4087 + Offset: -30,-24 conyardh: idle: DATA.R8 @@ -578,6 +656,9 @@ conyardh: bib: bib3x # TODO: read this from BLOXBAT.R8 Start: 0 Length: * + icon: DATA.R8 + Start: 4047 + Offset: -30,-24 starporth: idle: DATA.R8 @@ -605,6 +686,9 @@ starporth: bib: bib3x Start: 0 Length: * + icon: DATA.R8 + Start: 4093 + Offset: -30,-24 pwrh: idle: DATA.R8 @@ -624,6 +708,9 @@ pwrh: bib: bib2x Start: 0 Length: * + icon: DATA.R8 + Start: 4057 + Offset: -30,-24 barrh: idle: DATA.R8 @@ -639,6 +726,9 @@ barrh: bib: bib2x Start: 0 Length: * + icon: DATA.R8 + Start: 4060 + Offset: -30,-24 radarh: idle: DATA.R8 @@ -658,6 +748,9 @@ radarh: bib: bib3x Start: 0 Length: * + icon: DATA.R8 + Start: 4073 + Offset: -30,-24 refh: idle: DATA.R8 @@ -680,6 +773,9 @@ refh: bib: bib3x Start: 0 Length: * + icon: DATA.R8 + Start: 4067 + Offset: -30,-24 siloh: idle: DATA.R8 @@ -694,6 +790,9 @@ siloh: Start: 4313 Length: 14 Offset: -16,16 + icon: DATA.R8 + Start: 4085 + Offset: -30,-24 hightechh: idle: DATA.R8 @@ -713,6 +812,9 @@ hightechh: bib: bib3x Start: 0 Length: * + icon: DATA.R8 + Start: 4079 + Offset: -30,-24 palaceh: idle: DATA.R8 @@ -736,6 +838,9 @@ palaceh: bib: bib3x Start: 0 Length: * + icon: DATA.R8 + Start: 4103 + Offset: -30,-24 lighth: idle: DATA.R8 @@ -770,6 +875,9 @@ lighth: bib: bib3x Start: 0 Length: * + icon: DATA.R8 + Start: 4082 + Offset: -30,-24 heavyh: idle: DATA.R8 @@ -804,6 +912,9 @@ heavyh: bib: bib3x Start: 0 Length: * + icon: DATA.R8 + Start: 4088 + Offset: -30,-24 conyardo: idle: DATA.R8 @@ -827,6 +938,9 @@ conyardo: bib: bib3x # TODO: read this from BLOXBAT.R8 Start: 0 Length: * + icon: DATA.R8 + Start: 4048 + Offset: -30,-24 starporto: idle: DATA.R8 @@ -853,6 +967,9 @@ starporto: bib: bib3x Start: 0 Length: * + icon: DATA.R8 + Start: 4094 + Offset: -30,-24 pwro: idle: DATA.R8 @@ -873,6 +990,9 @@ pwro: bib: bib2x Start: 0 Length: * + icon: DATA.R8 + Start: 4058 + Offset: -30,-24 barro: idle: DATA.R8 @@ -888,6 +1008,9 @@ barro: bib: bib2x Start: 0 Length: * + icon: DATA.R8 + Start: 4061 + Offset: -30,-24 radaro: idle: DATA.R8 @@ -907,6 +1030,9 @@ radaro: bib: bib3x Start: 0 Length: * + icon: DATA.R8 + Start: 4074 + Offset: -30,-24 refo: idle: DATA.R8 @@ -929,6 +1055,9 @@ refo: bib: bib3x Start: 0 Length: * + icon: DATA.R8 + Start: 4068 + Offset: -30,-24 siloo: idle: DATA.R8 @@ -943,6 +1072,9 @@ siloo: Start: 4313 Length: 14 Offset: -16,16 + icon: DATA.R8 + Start: 4086 + Offset: -30,-24 hightecho: idle: DATA.R8 @@ -962,6 +1094,9 @@ hightecho: bib: bib3x Start: 0 Length: * + icon: DATA.R8 + Start: 4080 + Offset: -30,-24 palaceo: idle: DATA.R8 @@ -977,6 +1112,9 @@ palaceo: bib: bib3x Start: 0 Length: * + icon: DATA.R8 + Start: 4104 + Offset: -30,-24 lighto: idle: DATA.R8 @@ -1007,6 +1145,9 @@ lighto: bib: bib3x Start: 0 Length: * + icon: DATA.R8 + Start: 4083 + Offset: -30,-24 heavyo: idle: DATA.R8 @@ -1041,6 +1182,9 @@ heavyo: bib: bib3x Start: 0 Length: * + icon: DATA.R8 + Start: 4089 + Offset: -30,-24 palacec: # TODO: unused idle: DATA.R8 @@ -1052,6 +1196,8 @@ palacec: # TODO: unused bib: bib3x Start: 0 Length: * + icon: palacecicon + Start: 0 starportc: # TODO: unused idle: DATA.R8 @@ -1078,6 +1224,9 @@ starportc: # TODO: unused bib: bib3x Start: 0 Length: * + icon: DATA.R8 # TODO: blank + Start: 4020 + Offset: -30,-24 heavyc: # TODO: unused idle: DATA.R8 @@ -1112,6 +1261,9 @@ heavyc: # TODO: unused bib: bib3x Start: 0 Length: * + icon: DATA.R8 # TODO: blank + Start: 4020 + Offset: -30,-24 conyardc: # TODO: unused idle: DATA.R8 @@ -1135,8 +1287,17 @@ conyardc: # TODO: unused bib: bib3x # TODO: read this from BLOXBAT.R8 Start: 0 Length: * + icon: DATA.R8 + Start: 4049 + Offset: -30,-24 plates: # TODO: unused idle: DATA.R8 Start: 3008 Length: 6 + 4-plates-icon: DATA.R8 + Start: 4050 + Offset: -30,-24 + 6-plates-icon: DATA.R8 + Start: 4053 + Offset: -30,-24 diff --git a/mods/d2k/sequences/vehicles.yaml b/mods/d2k/sequences/vehicles.yaml index 75bca7c6e2..cee9dba417 100644 --- a/mods/d2k/sequences/vehicles.yaml +++ b/mods/d2k/sequences/vehicles.yaml @@ -2,6 +2,9 @@ dmcv: idle: DATA.R8 Start: 1795 Facings: -32 + icon: DATA.R8 + Start: 4023 + Offset: -30,-24 harvester: idle: DATA.R8 @@ -19,6 +22,9 @@ harvester: dock-loop: DATA.R8 Start: 3380 Length: 1 + icon: DATA.R8 + Start: 4019 + Offset: -30,-24 trike: idle: DATA.R8 @@ -30,6 +36,9 @@ trike: muzzle: DATA.R8 Start: 3839 Facings: -32 + icon: DATA.R8 + Start: 4041 + Offset: -30,-24 quad: idle: DATA.R8 @@ -41,6 +50,9 @@ quad: muzzle: DATA.R8 Start: 3839 Facings: -32 + icon: DATA.R8 + Start: 4018 + Offset: -30,-24 siegetank: idle: DATA.R8 @@ -49,16 +61,25 @@ siegetank: turret: DATA.R8 Start: 1891 Facings: -32 + icon: DATA.R8 + Start: 4026 + Offset: -30,-24 missiletank: idle: DATA.R8 Start: 1603 Facings: -32 + icon: DATA.R8 + Start: 4024 + Offset: -30,-24 sonictank: idle: DATA.R8 Start: 1827 Facings: -32 + icon: DATA.R8 + Start: 4027 + Offset: -30,-24 combata: idle: DATA.R8 @@ -67,6 +88,9 @@ combata: turret: DATA.R8 Start: 1859 Facings: -32 + icon: DATA.R8 + Start: 4020 + Offset: -30,-24 combath: idle: DATA.R8 @@ -75,6 +99,9 @@ combath: turret: DATA.R8 Start: 2115 Facings: -32 + icon: DATA.R8 + Start: 4021 + Offset: -30,-24 devast: idle: DATA.R8 @@ -84,6 +111,9 @@ devast: Start: 3807 Length: 1 Facings: -32 + icon: DATA.R8 + Start: 4028 + Offset: -30,-24 combato: idle: DATA.R8 @@ -92,6 +122,9 @@ combato: turret: DATA.R8 Start: 2485 Facings: -32 + icon: DATA.R8 + Start: 4022 + Offset: -30,-24 raider: idle: DATA.R8 @@ -103,8 +136,27 @@ raider: muzzle: DATA.R8 Start: 3839 Facings: -32 + icon: DATA.R8 + Start: 4017 + Offset: -30,-24 + +stealthraider: + idle: DATA.R8 + Start: 2421 + Facings: -32 + unload: DATA.R8 + Start: 2421 + Facings: -32 + muzzle: DATA.R8 + Start: 3839 + Facings: -32 + icon: raidersicon + Start: 0 deviatortank: idle: DATA.R8 Start: 2389 Facings: -32 + icon: DATA.R8 + Start: 4025 + Offset: -30,-24 \ No newline at end of file diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index d29a76033d..e504615d04 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -448,7 +448,6 @@ SNIPER: Valued: Cost: 700 Tooltip: - Icon: snipericon Name: Sniper Description: Elite sniper infantry unit.\n Strong vs Infantry\n Weak vs Vehicles Buildable: @@ -492,7 +491,6 @@ Zombie: Valued: Cost: 100 Tooltip: - Icon: zombicon Name: Zombie Description: Slow undead. Attacks in close combat. Buildable: @@ -519,7 +517,6 @@ Ant: Valued: Cost: 300 Tooltip: - Icon: anticon Name: Giant Ant Description: Irradiated insect that grew oversize. Buildable: diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index 3980dd451a..3f9558178a 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -5,7 +5,6 @@ MSLO: Tooltip: Name: Missile Silo Description: Launches a devastating atomic bomb\nat a target location.\n Special Ability: Atom Bomb\n\nMaximum 1 can be built - Icon: msloicon2 Buildable: Queue: Defense BuildPaletteOrder: 130 @@ -459,7 +458,6 @@ PBOX.E1: Tooltip: Name: Pillbox (Guns) Description: Basic defensive structure.\n Strong vs Infantry, Light Vehicles\n Weak vs Tanks, Aircraft - Icon: PBOXICON RenderBuilding: Image: PBOX RenderRangeCircle: @@ -624,7 +622,6 @@ HBOX.E1: Tooltip: Name: Camo Pillbox (Guns) Description: Hidden defensive structure.\n Strong vs Infantry, Light Vehicles\n Weak vs Tanks, Aircraft - Icon: HBOXICON RenderBuilding: Image: HBOX RenderRangeCircle: diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index c5dec0452a..39aa2b41ed 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -402,7 +402,6 @@ MNLY.AP: Cost: 800 Tooltip: Name: Minelayer (Anti-Personnel) - Icon: MNLYICON Description: Lays mines to destroy unwary enemy units.\n Unarmed Health: HP: 100 @@ -437,7 +436,6 @@ MNLY.AT: Cost: 800 Tooltip: Name: Minelayer (Anti-Tank) - Icon: MNLYICON Description: Lays mines to destroy unwary enemy units.\n Unarmed Health: HP: 100 diff --git a/mods/ra/sequences/aircraft.yaml b/mods/ra/sequences/aircraft.yaml index 5f0cd456bc..213f8cf344 100644 --- a/mods/ra/sequences/aircraft.yaml +++ b/mods/ra/sequences/aircraft.yaml @@ -2,6 +2,8 @@ mig: idle: Start: 0 Facings: 16 + icon: migicon + Start: 0 yak: idle: @@ -11,6 +13,8 @@ yak: Start: 0 Length: 6 Facings: 8 + icon: yakicon + Start: 0 heli: idle: @@ -22,6 +26,8 @@ heli: slow-rotor: lrotor Start: 4 Length: 8 + icon: heliicon + Start: 0 hind: idle: @@ -37,6 +43,8 @@ hind: Start: 0 Length: 6 Facings: 8 + icon: hindicon + Start: 0 tran: idle: tran2 @@ -60,6 +68,8 @@ tran: unload: tran2 Start: 32 Length: 4 + icon: tranicon + Start: 0 tran1husk: idle: diff --git a/mods/ra/sequences/infantry.yaml b/mods/ra/sequences/infantry.yaml index 042c336c46..7693f1ac37 100644 --- a/mods/ra/sequences/infantry.yaml +++ b/mods/ra/sequences/infantry.yaml @@ -64,6 +64,8 @@ e1: Start: 0 Length: 6 Tick: 1600 + icon: e1icon + Start: 0 sniper: stand: @@ -130,6 +132,8 @@ sniper: Start: 0 Length: 6 Tick: 1600 + icon: snipericon + Start: 0 e3: stand: @@ -190,6 +194,8 @@ e3: Start: 192 Length: 10 Facings: 8 + icon: e3icon + Start: 0 e6: stand: @@ -242,6 +248,8 @@ e6: Length: 4 Facings: 8 Tick: 100 + icon: e6icon + Start: 0 medi: stand: @@ -298,6 +306,8 @@ medi: Length: 4 Facings: 8 Tick: 100 + icon: mediicon + Start: 0 mech: stand: @@ -354,6 +364,8 @@ mech: Length: 4 Facings: 8 Tick: 100 + icon: mechicon + Start: 0 e2: stand: @@ -414,6 +426,8 @@ e2: Start: 288 Length: 12 Facings: 8 + icon: e2icon + Start: 0 dog: stand: @@ -458,6 +472,8 @@ dog: Start: 0 Length: 4 Facings: 8 + icon: dogicon + Start: 0 spy: stand: @@ -518,6 +534,8 @@ spy: Start: 192 Length: 8 Facings: 8 + icon: spyicon + Start: 0 thf: stand: @@ -550,6 +568,8 @@ thf: Start: 72 Length: 4 Facings: 8 + icon: thficon + Start: 0 e7: stand: @@ -607,6 +627,8 @@ e7: Start: 176 Length: 7 Facings: 8 + icon: e7icon + Start: 0 e4: stand: @@ -667,6 +689,8 @@ e4: Start: 256 Length: 16 Facings: 8 + icon: e4icon + Start: 0 gnrl: stand: @@ -786,6 +810,8 @@ shok: die6: electro Start: 0 Length: * + icon: shokicon + Start: 0 c1: stand: @@ -1080,6 +1106,8 @@ zombie: Start: 0 Length: 6 Tick: 1600 + icon: zombicon + Start: 0 ant: stand: @@ -1123,4 +1151,6 @@ ant: die-crushed: Start: 104 Length: 8 - Tick: 300 \ No newline at end of file + Tick: 300 + icon: anticon + Start: 0 \ No newline at end of file diff --git a/mods/ra/sequences/ships.yaml b/mods/ra/sequences/ships.yaml index 49cc5f4f39..9e992b3d1c 100644 --- a/mods/ra/sequences/ships.yaml +++ b/mods/ra/sequences/ships.yaml @@ -2,6 +2,8 @@ ss: idle: Start: 0 Facings: 16 + icon: ssicon + Start: 0 ca: idle: @@ -13,6 +15,8 @@ ca: muzzle: gunfire2 Start: 0 Length: 5 + icon: caicon + Start: 0 dd: idle: @@ -21,6 +25,8 @@ dd: turret: ssam Start: 0 Facings: 32 + icon: ddicon + Start: 0 pt: idle: @@ -32,6 +38,8 @@ pt: muzzle: gunfire2 Start: 0 Length: 5 + icon: pticon + Start: 0 lst: idle: @@ -41,8 +49,12 @@ lst: Length: 4 unload: Start: 4 + icon: lsticon + Start: 0 msub: idle: Start: 0 Facings: 16 + icon: msubicon + Start: 0 \ No newline at end of file diff --git a/mods/ra/sequences/structures.yaml b/mods/ra/sequences/structures.yaml index 5f971ba1af..e43eda7f1a 100644 --- a/mods/ra/sequences/structures.yaml +++ b/mods/ra/sequences/structures.yaml @@ -60,6 +60,8 @@ fact: bib: bib2 Start: 0 Length: * + icon: facticon + Start: 0 proc: idle: @@ -74,6 +76,8 @@ proc: bib: bib2 Start: 0 Length: * + icon: procicon + Start: 0 silo: idle: silo2 @@ -85,6 +89,8 @@ silo: make: silomake Start: 0 Length: * + icon: siloicon + Start: 0 powr: idle: @@ -99,6 +105,8 @@ powr: bib: bib3 Start: 0 Length: * + icon: powricon + Start: 0 apwr: idle: @@ -113,6 +121,8 @@ apwr: bib: bib2 Start: 0 Length: * + icon: apwricon + Start: 0 barr: idle: @@ -127,6 +137,8 @@ barr: bib: bib3 Start: 0 Length: * + icon: barricon + Start: 0 tent: idle: @@ -141,6 +153,8 @@ tent: bib: bib3 Start: 0 Length: * + icon: tenticon + Start: 0 kenn: idle: @@ -150,6 +164,8 @@ kenn: make: kennmake Start: 0 Length: * + icon: kennicon + Start: 0 dome: idle: @@ -162,6 +178,8 @@ dome: bib: bib3 Start: 0 Length: * + icon: domeicon + Start: 0 atek: idle: @@ -178,6 +196,8 @@ atek: bib: bib3 Start: 0 Length: * + icon: atekicon + Start: 0 stek: idle: @@ -190,6 +210,8 @@ stek: bib: bib2 Start: 0 Length: * + icon: stekicon + Start: 0 weap: idle: @@ -212,6 +234,8 @@ weap: bib: bib2 Start: 0 Length: * + icon: weapicon + Start: 0 hpad: idle: @@ -234,6 +258,8 @@ hpad: bib: bib3 Start: 0 Length: * + icon: hpadicon + Start: 0 afld: idle: afldidle @@ -259,6 +285,8 @@ afld: make: afldmake Start: 0 Length: * + icon: afldicon + Start: 0 spen: idle: @@ -268,6 +296,8 @@ spen: make: spenmake Start: 0 Length: * + icon: spenicon + Start: 0 syrd: idle: @@ -277,6 +307,8 @@ syrd: make: syrdmake Start: 0 Length: * + icon: syrdicon + Start: 0 fix: idle: @@ -296,6 +328,8 @@ fix: make: fixmake Start: 0 Length: * + icon: fixicon + Start: 0 gun: idle: @@ -316,6 +350,8 @@ gun: muzzle: gunfire2 Start: 0 Length: 5 + icon: gunicon + Start: 0 agun: idle: @@ -336,6 +372,8 @@ agun: muzzle: gunfire2 Start: 1 Length: 4 + icon: agunicon + Start: 0 sam: idle: @@ -351,6 +389,8 @@ sam: Start: 0 Length: 18 Facings: 8 + icon: samicon + Start: 0 ftur: idle: @@ -360,6 +400,8 @@ ftur: make: fturmake Start: 0 Length: * + icon: fturicon + Start: 0 tsla: idle: @@ -377,6 +419,8 @@ tsla: Start: 11 Length: 9 Tick: 100 + icon: tslaicon + Start: 0 pbox: idle: @@ -390,6 +434,8 @@ pbox: Start: 0 Length: 6 Facings: 8 + icon: pboxicon + Start: 0 hbox: damaged-idle: @@ -403,6 +449,8 @@ hbox: Start: 0 Length: 6 Facings: 8 + icon: hboxicon + Start: 0 gap: idle: @@ -414,6 +462,8 @@ gap: make: gapmake Start: 0 Length: * + icon: gapicon + Start: 0 iron: idle: @@ -434,6 +484,8 @@ iron: Start: 0 Length: * Offset: 0,-12 + icon: ironicon + Start: 0 pdox: idle: @@ -449,6 +501,8 @@ pdox: make: pdoxmake Start: 0 Length: * + icon: pdoxicon + Start: 0 mslo: idle: @@ -465,6 +519,8 @@ mslo: damaged-active: Start: 9 Length: 7 + icon: msloicon2 + Start: 0 miss: idle: @@ -491,6 +547,8 @@ brik: critical-idle: Start: 48 Length: 16 + icon: brikicon + Start: 0 sbag: idle: @@ -499,6 +557,8 @@ sbag: damaged-idle: Start: 16 Length: 16 + icon: sbagicon + Start: 0 fenc: idle: @@ -507,6 +567,8 @@ fenc: damaged-idle: Start: 16 Length: 16 + icon: fencicon + Start: 0 cycl: idle: diff --git a/mods/ra/sequences/vehicles.yaml b/mods/ra/sequences/vehicles.yaml index f9797882c1..b1688f105d 100644 --- a/mods/ra/sequences/vehicles.yaml +++ b/mods/ra/sequences/vehicles.yaml @@ -2,6 +2,8 @@ mcv: idle: Start: 0 Facings: 32 + icon: mcvicon + Start: 0 mcvhusk: idle: @@ -12,6 +14,8 @@ truk: idle: Start: 0 Facings: 32 + icon: trukicon + Start: 0 harv: idle: @@ -27,6 +31,8 @@ harv: dock-loop: Start: 104 Length: 7 + icon: harvicon + Start: 0 harvhalf: idle: @@ -78,6 +84,8 @@ hhusk2: muzzle: gunfire2 Start: 0 Length: 2 + icon: 1tnkicon + Start: 0 2tnk: idle: @@ -89,6 +97,8 @@ hhusk2: muzzle: gunfire2 Start: 0 Length: 5 + icon: 2tnkicon + Start: 0 3tnk: idle: @@ -100,6 +110,8 @@ hhusk2: muzzle: gunfire2 Start: 0 Length: 5 + icon: 3tnkicon + Start: 0 4tnk: idle: @@ -111,6 +123,8 @@ hhusk2: muzzle: gunfire2 Start: 0 Length: 5 + icon: 4tnkicon + Start: 0 v2rl: idle: @@ -125,6 +139,8 @@ v2rl: empty-aim: Start: 72 Facings: 8 + icon: v2rlicon + Start: 0 arty: idle: @@ -133,6 +149,8 @@ arty: muzzle: gunfire2 Start: 0 Length: 5 + icon: artyicon + Start: 0 jeep: idle: @@ -148,6 +166,8 @@ jeep: unload: Start: 0 Facings: 32 + icon: jeepicon + Start: 0 apc: idle: @@ -162,11 +182,15 @@ apc: Length: 3 unload: Start: 32 + icon: apcicon + Start: 0 mnly: idle: Start: 0 Facings: 32 + icon: mnlyicon + Start: 0 mrj: idle: @@ -175,6 +199,8 @@ mrj: spinner: Start: 32 Length: 32 + icon: mrjicon + Start: 0 mgg: idle: @@ -186,6 +212,8 @@ mgg: spinner-idle: Start: 32 Length: 1 + icon: mggicon + Start: 0 ttnk: idle: @@ -194,6 +222,8 @@ ttnk: spinner: Start: 32 Length: 32 + icon: ttnkicon + Start: 0 ftrk: idle: @@ -205,11 +235,15 @@ ftrk: muzzle: gunfire2 Start: 0 Length: 2 + icon: ftrkicon + Start: 0 dtrk: idle: Start: 0 Facings: 32 + icon: dtrkicon + Start: 0 ctnk: idle: @@ -218,3 +252,5 @@ ctnk: muzzle: gunfire2 Start: 0 Length: 5 + icon: ctnkicon + Start: 0 \ No newline at end of file diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml index 6361ffb1ef..df6145fe5a 100644 --- a/mods/ts/rules/aircraft.yaml +++ b/mods/ts/rules/aircraft.yaml @@ -4,7 +4,6 @@ DPOD: Cost: 10 Tooltip: Name: Drop Pod - Icon: podsicon Buildable: Queue: Air BuildPaletteOrder: 10 @@ -42,7 +41,6 @@ DSHP: Cost: 1000 Tooltip: Name: Dropship - Icon: xxicon Buildable: Queue: Air BuildPaletteOrder: 10 @@ -74,7 +72,6 @@ ORCA: Cost: 1000 Tooltip: Name: Orca Fighter - Icon: orcaicon Description: Helicopter Gunship with Missiles.\n Strong vs Buildings, Tanks\n Weak vs Infantry Buildable: Queue: Air @@ -111,7 +108,6 @@ ORCAB: Cost: 1600 Tooltip: Name: Orca Bomber - Icon: obmbicon Buildable: Queue: Air BuildPaletteOrder: 20 @@ -147,7 +143,6 @@ ORCATRAN: Cost: 1200 Tooltip: Name: Orca Transport - Icon: crryicon Buildable: Queue: Air BuildPaletteOrder: 10 @@ -179,7 +174,6 @@ TRNSPORT: # TODO: set up the vehicle cargo traits, but beware of desyncs Cost: 750 Tooltip: Name: Carryall - Icon: otrnicon Buildable: Queue: Air BuildPaletteOrder: 10 @@ -207,7 +201,6 @@ SCRIN: Cost: 1500 Tooltip: Name: Banshee Fighter - Icon: proicon Buildable: Queue: Air BuildPaletteOrder: 20 @@ -243,7 +236,6 @@ APACHE: Cost: 1000 Tooltip: Name: Harpy - Icon: apchicon Buildable: Queue: Air BuildPaletteOrder: 20 diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 9da6820afe..1bdb1a7818 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -91,7 +91,6 @@ Cost: 10 Tooltip: Name: Civilian - Icon: xxicon Buildable: # TODO: remove this once the testing period is over Queue: Infantry BuildPaletteOrder: 1000 diff --git a/mods/ts/rules/infantry.yaml b/mods/ts/rules/infantry.yaml index dba1fe2398..c378b22d1e 100644 --- a/mods/ts/rules/infantry.yaml +++ b/mods/ts/rules/infantry.yaml @@ -64,7 +64,6 @@ E3: Tooltip: Name: Rocket Infantry Description: Anti-tank infantry.\n Strong vs Tanks\n Weak vs Infantry - Icon: e4icon # TODO: really? Selectable: Bounds: 12,17,0,-9 Voice: Rocket @@ -88,7 +87,6 @@ WEEDGUY: Tooltip: Name: Chem Spray Infantry Description: Advanced Anti-infantry unit.\n Strong vs Infantry\n Weak vs Vehicles - Icon: weaticon Buildable: Queue: Infantry BuildPaletteOrder: 50 @@ -119,7 +117,6 @@ MEDIC: Tooltip: Name: Medic Description: Heals nearby infantry.\n Strong vs Nothing\n Weak vs Everything - Icon: mediicon Buildable: Queue: Infantry BuildPaletteOrder: 60 @@ -151,7 +148,6 @@ ENGINEER: Tooltip: Name: Engineer Description: Infiltrates and captures enemy structures.\n Strong vs Nothing\n Weak vs Everything - Icon: engnicon Buildable: Queue: Infantry BuildPaletteOrder: 30 @@ -183,7 +179,6 @@ UMAGON: Valued: Cost: 400 Tooltip: - Icon: umagicon Name: Umagon Description: Elite sniper infantry unit.\n Strong vs Infantry, Buildings\n Weak vs Vehicles Buildable: @@ -214,7 +209,6 @@ GHOST: Valued: Cost: 1750 Tooltip: - Icon: gosticon Name: Ghost Stalker Description: Elite commando infantry, armed with \ndual pistols and C4.\n Strong vs Infantry, Buildings\n Weak vs Vehicles\n Special Ability: Destroy Building with C4\n\nMaximum 1 can be trained BuildLimit: 1 @@ -250,7 +244,6 @@ JUMPJET: Valued: Cost: 600 Tooltip: - Icon: jjeticon Name: Jumpjet Infantry Buildable: Queue: Infantry @@ -290,7 +283,6 @@ CHAMSPY: SpyToolTip: Name: Chameleon Spy Description: Infiltrates enemy structures to gather \nintelligence. Exact effect depends on the \nbuilding infiltrated.\n Strong vs Nothing\n Weak vs Everything\n Special Ability: Disguised - Icon: chamicon Selectable: Voice: Spy Bounds: 12,17,0,-9 @@ -320,7 +312,6 @@ CYBORG: Valued: Cost: 650 Tooltip: - Icon: cybiicon Name: Cyborg Infantry Description: Cybernetic infantry unit.\n Strong vs Infantry, Buildings\n Weak vs Vehicles Buildable: @@ -359,7 +350,6 @@ CYC2: Valued: Cost: 2000 Tooltip: - Icon: cybcicon Name: Cyborg Commando Description: Elite cybernetic infantry unit.\n Strong vs Infantry, Buildings\n Weak vs Vehicles Buildable: @@ -402,7 +392,6 @@ MUTANT: Tooltip: Name: Mutant Description: General-purpose infantry.\n Strong vs Infantry\n Weak vs Vehicles - Icon: mutcicon Selectable: Bounds: 12,17,0,-9 Voice: Mutant @@ -433,7 +422,6 @@ MWMN: Tooltip: Name: Mutant Soldier Description: General-purpose infantry.\n Strong vs Infantry\n Weak vs Vehicles - Icon: mutcicon Selectable: Bounds: 12,17,0,-9 Voice: Mutant @@ -464,7 +452,6 @@ MUTANT3: Tooltip: Name: Mutant Sergeant Description: General-purpose infantry.\n Strong vs Infantry\n Weak vs Vehicles - Icon: mutcicon Selectable: Bounds: 12,17,0,-9 Voice: Mutant @@ -495,7 +482,6 @@ MHIJACK: # TODO: does not work Tooltip: Name: Mutant Hijacker Description: General-purpose infantry.\n Strong vs Infantry\n Weak vs Vehicles - Icon: mutcicon Selectable: Bounds: 12,17,0,-9 Voice: Hijacker @@ -524,7 +510,6 @@ TRATOS: Cost: 100 Tooltip: Name: Tratos - Icon: mutcicon Selectable: Bounds: 12,17,0,-9 Voice: Tratos @@ -553,7 +538,6 @@ OXANNA: Cost: 100 Tooltip: Name: Oxanna - Icon: mutcicon Selectable: Bounds: 12,17,0,-9 Voice: Oxanna @@ -582,7 +566,6 @@ SLAV: Cost: 100 Tooltip: Name: Slavick - Icon: mutcicon Selectable: Bounds: 12,17,0,-9 Voice: Slavick @@ -605,7 +588,6 @@ DOGGIE: Inherits: ^Infantry Tooltip: Name: Tiberian Fiend - Icon: xxicon Buildable: Queue: Infantry BuildPaletteOrder: 100 @@ -638,7 +620,6 @@ VISSML: Inherits: ^Infantry Tooltip: Name: Baby Visceroid - Icon: xxicon Buildable: Queue: Infantry BuildPaletteOrder: 100 @@ -670,7 +651,6 @@ VISLRG: Inherits: ^Infantry Tooltip: Name: Adult Visceroid - Icon: xxicon Buildable: Queue: Infantry BuildPaletteOrder: 100 diff --git a/mods/ts/rules/structures.yaml b/mods/ts/rules/structures.yaml index 89afd5b241..69c03e16a1 100644 --- a/mods/ts/rules/structures.yaml +++ b/mods/ts/rules/structures.yaml @@ -21,7 +21,6 @@ GACNST: Tooltip: Name: Construction Yard Description: Builds base structures. - Icon: facticon CustomSellValue: Value: 2500 BaseBuilding: @@ -50,7 +49,6 @@ GAPOWR: Tooltip: Name: GDI Power Plant Description: Provides power for other structures - Icon: powricon ProvidesCustomPrerequisite: Prerequisite: anypower Building: @@ -81,7 +79,6 @@ GAPILE: Tooltip: Name: GDI Barracks Description: Produces infantry - Icon: brrkicon Building: Power: -20 Footprint: xx xx @@ -114,7 +111,6 @@ GAWEAP: Cost: 2000 Tooltip: Name: GDI War Factory - Icon: weapicon Description: Assembly point for\nvehicle reinforcements # ProvidesCustomPrerequisite: # Prerequisite: VehicleProduction @@ -158,7 +154,6 @@ GASAND: Tooltip: Name: Sandbags Description: Stops infantry and blocks enemy fire.\nCan be crushed by tanks. - Icon: sbagicon Health: HP: 250 Armor: @@ -303,7 +298,6 @@ GASPOT: # TODO: has moving spotlights Cost: 300 Tooltip: Name: Light Tower - Icon: spoticon Building: Power: -10 Footprint: x @@ -326,7 +320,6 @@ GAHPAD: Cost: 500 Tooltip: Name: Helipad - Icon: heliicon Description: Produces, rearms and\nrepairs helicopters Buildable: BuildPaletteOrder: 60 diff --git a/mods/ts/rules/vehicles.yaml b/mods/ts/rules/vehicles.yaml index b35f23eb7f..ca41fcc45e 100644 --- a/mods/ts/rules/vehicles.yaml +++ b/mods/ts/rules/vehicles.yaml @@ -41,7 +41,6 @@ APC: Cost: 600 Tooltip: Name: Amphibious APC # TODO: not yet amphibious - Icon: apcicon Description: Armored infantry transport and mobile AA\n Strong vs Aircraft, Vehicles\n Weak vs Infantry Buildable: Queue: Vehicle @@ -74,7 +73,6 @@ HARV: # TODO: without back: HORV Cost: 1400 Tooltip: Name: Harvester - Icon: harvicon Description: Collects Tiberium for processing.\n Unarmed Buildable: Queue: Vehicle @@ -117,7 +115,6 @@ HVR: Cost: 900 Tooltip: Name: Hover MLRS - Icon: hovricon Description: Hover Multi-Launch Rocket System Buildable: Queue: Vehicle @@ -148,7 +145,6 @@ HVR: Cost: 1700 Tooltip: Name: Mammoth Tank - Icon: xxicon Description: Heavily armored GDI Tank.\n Strong vs Everything Buildable: Queue: Vehicle @@ -191,7 +187,6 @@ TRUCKB: # NOTE: TRUCKA is unloaded Tooltip: Name: Truck Description: Transports cash to other players.\n Unarmed - Icon: xxicon Health: HP: 2000 Armor: @@ -214,7 +209,6 @@ LPST: Cost: 950 Tooltip: Name: Mobile Sensor Array - Icon: lpsticon Buildable: Queue: Vehicle BuildPaletteOrder: 100 @@ -246,7 +240,6 @@ ICBM: Cost: 1400 Tooltip: Name: Ballistic Missile Launcher - Icon: xxicon Buildable: Queue: Vehicle BuildPaletteOrder: 100 @@ -283,7 +276,6 @@ REPAIR: Tooltip: Name: Mobile Repair Vehicle Description: Repairs nearby vehicles.\n Strong vs Nothing\n Weak vs Everything - Icon: rboticon Health: HP: 200 Mobile: @@ -307,7 +299,6 @@ ART2: Cost: 975 Tooltip: Name: Artillery - Icon: artyicon Buildable: Queue: Vehicle BuildPaletteOrder: 100 @@ -339,7 +330,6 @@ WEED: Cost: 1400 Tooltip: Name: Weed Eater - Icon: weedicon Description: Collects veins for processing.\n Unarmed Buildable: Queue: Vehicle @@ -376,7 +366,6 @@ BUS: Cost: 800 Tooltip: Name: School Bus - Icon: xxicon Buildable: Queue: Vehicle BuildPaletteOrder: 300 @@ -406,7 +395,6 @@ PICK: Cost: 800 Tooltip: Name: Pickup - Icon: xxicon Buildable: Queue: Vehicle BuildPaletteOrder: 300 @@ -436,7 +424,6 @@ CAR: Cost: 800 Tooltip: Name: Automobile - Icon: xxicon Buildable: Queue: Vehicle BuildPaletteOrder: 300 @@ -466,7 +453,6 @@ GGHUNT: Cost: 1000 Tooltip: Name: Hunter-Seeker Droid - Icon: seekicon Buildable: BuildPaletteOrder: 20 Owner: gdi, nod @@ -494,7 +480,6 @@ WINI: Cost: 800 Tooltip: Name: Recreational Vehicle - Icon: xxicon Buildable: Queue: Vehicle BuildPaletteOrder: 300 @@ -524,7 +509,6 @@ MMCH: Cost: 800 Tooltip: Name: Medium Mech - Icon: mmchicon Buildable: Queue: Vehicle BuildPaletteOrder: 300 @@ -558,7 +542,6 @@ HMEC: Cost: 3000 Tooltip: Name: Mammoth Mk. II - Icon: hmecicon Buildable: Queue: Vehicle BuildPaletteOrder: 40 @@ -591,7 +574,6 @@ SMECH: Tooltip: Name: Wolverine Description: Small Mech - Icon: smchicon Buildable: Queue: Vehicle BuildPaletteOrder: 10 @@ -619,7 +601,6 @@ BIKE: Cost: 600 Tooltip: Name: Attack Cycle - Icon: cyclicon Description: Fast scout vehicle, armed with \nrockets.\n Strong vs Vehicles, Aircraft\n Weak vs Infantry Buildable: Queue: Vehicle @@ -650,7 +631,6 @@ BGGY: Cost: 500 Tooltip: Name: Attack Buggy - Icon: bggyicon Description: Fast scout & anti-infantry vehicle.\n Strong vs Infantry, Vehicles\n Weak vs Tanks, Aircraft Buildable: Queue: Vehicle @@ -679,7 +659,6 @@ SAPC: Cost: 800 Tooltip: Name: Subterranean APC # TODO: not yet subterranean - Icon: sapcicon Description: Armored infantry transport and mobile AA\n Strong vs Aircraft, Vehicles\n Weak vs Infantry Buildable: Queue: Vehicle @@ -710,7 +689,6 @@ SUBTANK: Cost: 750 Tooltip: Name: Devil's Tongue - Icon: subticon Description: Subterranean Tank Buildable: Queue: Vehicle @@ -739,7 +717,6 @@ SONIC: Cost: 1300 Tooltip: Name: Disruptor - Icon: soniicon Buildable: Queue: Vehicle BuildPaletteOrder: 40 @@ -769,7 +746,6 @@ TTNK: Cost: 800 Tooltip: Name: Tick Tank - Icon: tickicon Buildable: Queue: Vehicle BuildPaletteOrder: 60 @@ -800,7 +776,6 @@ STNK: Cost: 1100 Tooltip: Name: Stealth Tank - Icon: stnkicon Description: Long-range missile tank that can cloak.\nHas weak armor. Can be spotted by infantry.\n Strong vs Vehicles, Tanks, Aircraft\n Weak vs Infantry. Buildable: BuildPaletteOrder: 90 diff --git a/mods/ts/sequences/aircraft.yaml b/mods/ts/sequences/aircraft.yaml index e69de29bb2..70cca669a7 100644 --- a/mods/ts/sequences/aircraft.yaml +++ b/mods/ts/sequences/aircraft.yaml @@ -0,0 +1,31 @@ +dpod: + icon: podsicon + Start: 0 + +dshp: + icon: xxicon + Start: 0 + +orca: + icon: orcaicon + Start: 0 + +orcab: + icon: obmbicon + Start: 0 + +orcatran: + icon: crryicon + Start: 0 + +trnsport: + icon: otrnicon + Start: 0 + +scrin: + icon: proicon + Start: 0 + +apache: + icon: apchicon + Start: 0 \ No newline at end of file diff --git a/mods/ts/sequences/infantry.yaml b/mods/ts/sequences/infantry.yaml index 7ee45da330..00ad1d6548 100644 --- a/mods/ts/sequences/infantry.yaml +++ b/mods/ts/sequences/infantry.yaml @@ -60,6 +60,8 @@ e1: die6: electro Start: 0 Length: * + icon: e1icon + Start: 0 e2: stand: @@ -123,6 +125,8 @@ e2: die6: electro Start: 0 Length: * + icon: e2icon + Start: 0 e3: stand: @@ -186,6 +190,8 @@ e3: die6: electro Start: 0 Length: * + icon: e4icon + Start: 0 weedguy: stand: weed @@ -244,6 +250,8 @@ weedguy: die6: electro Start: 0 Length: * + icon: weaticon + Start: 0 medic: stand: @@ -298,6 +306,8 @@ medic: die6: electro Start: 0 Length: * + icon: mediicon + Start: 0 engineer: stand: @@ -341,6 +351,8 @@ engineer: die6: electro Start: 0 Length: * + icon: engnicon + Start: 0 umagon: stand: @@ -404,6 +416,8 @@ umagon: die6: electro Start: 0 Length: * + icon: umagicon + Start: 0 ghost: # TODO unused GUNFIRE.SHP stand: @@ -467,6 +481,8 @@ ghost: # TODO unused GUNFIRE.SHP die6: electro Start: 0 Length: * + icon: gosticon + Start: 0 jumpjet: # TODO: ShadowStart: stand: @@ -519,6 +535,8 @@ jumpjet: # TODO: ShadowStart: die6: electro Start: 0 Length: * + icon: jjeticon + Start: 0 mhijack: stand: @@ -582,6 +600,8 @@ mhijack: die6: electro Start: 0 Length: * + icon: mutcicon + Start: 0 chamspy: stand: @@ -645,6 +665,8 @@ chamspy: die6: electro Start: 0 Length: * + icon: chamicon + Start: 0 cyc2: stand: @@ -708,6 +730,8 @@ cyc2: die6: electro Start: 0 Length: * + icon: cybcicon + Start: 0 cyborg: stand: @@ -765,6 +789,8 @@ cyborg: die6: electro Start: 0 Length: * + icon: cybiicon + Start: 0 mutant: # TODO unused MGUN-N,MGUN-NE,MGUN-E,MGUN-SE,MGUN-S,MGUN-SW,MGUN-W,MGUN-NW stand: @@ -828,6 +854,8 @@ mutant: # TODO unused MGUN-N,MGUN-NE,MGUN-E,MGUN-SE,MGUN-S,MGUN-SW,MGUN-W,MGUN-N die6: electro Start: 0 Length: * + icon: mutcicon + Start: 0 mwmn: # TODO unused MGUN-N,MGUN-NE,MGUN-E,MGUN-SE,MGUN-S,MGUN-SW,MGUN-W,MGUN-NW stand: @@ -891,6 +919,8 @@ mwmn: # TODO unused MGUN-N,MGUN-NE,MGUN-E,MGUN-SE,MGUN-S,MGUN-SW,MGUN-W,MGUN-NW die6: electro Start: 0 Length: * + icon: mutcicon + Start: 0 mutant3: # TODO unused MGUN-N,MGUN-NE,MGUN-E,MGUN-SE,MGUN-S,MGUN-SW,MGUN-W,MGUN-NW stand: @@ -954,6 +984,8 @@ mutant3: # TODO unused MGUN-N,MGUN-NE,MGUN-E,MGUN-SE,MGUN-S,MGUN-SW,MGUN-W,MGUN- die6: electro Start: 0 Length: * + icon: mutcicon + Start: 0 tratos: stand: @@ -1017,6 +1049,8 @@ tratos: die6: electro Start: 0 Length: * + icon: mutcicon + Start: 0 oxanna: stand: @@ -1080,6 +1114,8 @@ oxanna: die6: electro Start: 0 Length: * + icon: mutcicon + Start: 0 slav: stand: @@ -1143,6 +1179,8 @@ slav: die6: electro Start: 0 Length: * + icon: mutcicon + Start: 0 doggie: # TODO: not sure what frame 88 and following is stand: @@ -1176,12 +1214,16 @@ doggie: # TODO: not sure what frame 88 and following is Start: 109 Length: 9 ShadowStart: 228 + icon: xxicon + Start: 0 vissml: idle: Start: 0 Length: 90 ShadowStart: 90 + icon: xxicon + Start: 0 vislrg: idle: @@ -1193,6 +1235,8 @@ vislrg: Length: 5 Facings: 8 ShadowStart: 40 + icon: xxicon + Start: 0 civ1: stand: @@ -1230,6 +1274,8 @@ civ1: die6: electro Start: 0 Length: * + icon: xxicon + Start: 0 civ2: stand: @@ -1267,6 +1313,8 @@ civ2: die6: electro Start: 0 Length: * + icon: xxicon + Start: 0 civ3: stand: @@ -1303,4 +1351,6 @@ civ3: ShadowStart: 441 die6: electro Start: 0 - Length: * \ No newline at end of file + Length: * + icon: xxicon + Start: 0 \ No newline at end of file diff --git a/mods/ts/sequences/structures.yaml b/mods/ts/sequences/structures.yaml index f5fef7e830..51d7adff5a 100644 --- a/mods/ts/sequences/structures.yaml +++ b/mods/ts/sequences/structures.yaml @@ -46,6 +46,8 @@ gacnst: critical-idle-front: gtcnst_b Start: 0 Length: 10 + icon: facticon + Start: 0 gapowr: idle: gtpowr @@ -85,6 +87,8 @@ gapowr: Start: 0 Length: 20 ShadowStart: 20 + icon: powricon + Start: 0 gapile: idle: gtpile @@ -122,6 +126,8 @@ gapile: Start: 0 Length: 20 ShadowStart: 20 + icon: brrkicon + Start: 0 gaweap: idle: gtweap @@ -150,6 +156,8 @@ gaweap: Length: 20 Tick: 80 ShadowStart: 20 + icon: weapicon + Start: 0 # TODO: gtweap_1 & gtweapbb & gtweap_a & gtweap_b & gtweap_c are unused gasand: # TODO frame order (horizontal seems busted) @@ -161,6 +169,8 @@ gasand: # TODO frame order (horizontal seems busted) Start: 16 Length: 16 ShadowStart: 48 + icon: sbagicon + Start: 0 gatick: idle: @@ -244,6 +254,8 @@ gaspot: Start: 0 Length: 14 ShadowStart: 14 + icon: spoticon + Start: 0 gahpad: idle: @@ -282,4 +294,6 @@ gahpad: make: gahpadmk Start: 0 Length: 18 - ShadowStart: 18 \ No newline at end of file + ShadowStart: 18 + icon: heliicon + Start: 0 \ No newline at end of file diff --git a/mods/ts/sequences/vehicles.yaml b/mods/ts/sequences/vehicles.yaml index f8f01324bd..113219f6de 100644 --- a/mods/ts/sequences/vehicles.yaml +++ b/mods/ts/sequences/vehicles.yaml @@ -1,3 +1,95 @@ +mcv: + icon: mcvicon + Start: 0 + +apc: + icon: apcicon + Start: 0 + +harv: + icon: harvicon + Start: 0 + +hvr: + icon: hovricon + Start: 0 + +4tnk: + icon: xxicon + Start: 0 + +truckb: + icon: xxicon + Start: 0 + +lpst: + icon: lpsticon + Start: 0 + +icbm: + icon: xxicon + Start: 0 + +repair: + icon: rboticon + Start: 0 + +art2: + icon: artyicon + Start: 0 + +weed: + icon: weedicon + Start: 0 + +bus: + icon: xxicon + Start: 0 + +pick: + icon: xxicon + Start: 0 + +car: + icon: xxicon + Start: 0 + +wini: + icon: xxicon + Start: 0 + +hmec: + icon: hmecicon + Start: 0 + +bike: + icon: cyclicon + Start: 0 + +bggy: + icon: bggyicon + Start: 0 + +sapc: + icon: sapcicon + Start: 0 + +subtank: + icon: subticon + Start: 0 + +sonic: + icon: soniicon + Start: 0 + +ttnk: + icon: tickicon + Start: 0 + +stnk: + icon: stnkicon + Start: 0 + mmch: stand: Start: 0 @@ -12,6 +104,8 @@ mmch: turret: Start: 120 Facings: -32 + icon: mmchicon + Start: 0 gghunt: idle: @@ -19,6 +113,8 @@ gghunt: Facings: 1 Length: 8 ShadowStart: 8 + icon: seekicon + Start: 0 smech: stand: # TODO: slightly glitchy @@ -34,4 +130,6 @@ smech: Start: 104 Length: 4 Facings: -8 - ShadowStart: 240 \ No newline at end of file + ShadowStart: 240 + icon: smchicon + Start: 0 \ No newline at end of file