diff --git a/OpenRA.Mods.Cnc/ProductionAirdrop.cs b/OpenRA.Mods.Cnc/ProductionAirdrop.cs index 476f48f7d7..ccc439f851 100644 --- a/OpenRA.Mods.Cnc/ProductionAirdrop.cs +++ b/OpenRA.Mods.Cnc/ProductionAirdrop.cs @@ -20,7 +20,7 @@ namespace OpenRA.Mods.Cnc { public class ProductionAirdropInfo : ProductionInfo { - public readonly string ReadyAudio = "reinfor1.aud"; + public readonly string ReadyAudio = "Reinforce"; [ActorReference] public readonly string ActorType = "c17"; public override object Create(ActorInitializer init) { return new ProductionAirdrop(this); } @@ -66,7 +66,7 @@ namespace OpenRA.Mods.Cnc rb.PlayCustomAnimRepeating(self, "idle"); self.World.AddFrameEndTask(ww => DoProduction(self, producee, exit)); - Sound.PlayToPlayer(self.Owner, (Info as ProductionAirdropInfo).ReadyAudio); + Sound.PlayNotification(self.Owner, "Speech", (Info as ProductionAirdropInfo).ReadyAudio, self.Owner.Country.Race); })); a.QueueActivity(Fly.ToCell(endPos)); a.QueueActivity(new RemoveSelf()); diff --git a/OpenRA.Mods.Cnc/Widgets/ProductionPaletteWidget.cs b/OpenRA.Mods.Cnc/Widgets/ProductionPaletteWidget.cs index b921634394..3e2b0c1ada 100755 --- a/OpenRA.Mods.Cnc/Widgets/ProductionPaletteWidget.cs +++ b/OpenRA.Mods.Cnc/Widgets/ProductionPaletteWidget.cs @@ -146,7 +146,7 @@ namespace OpenRA.Mods.Cnc.Widgets else if (CurrentQueue.BuildableItems().Any(a => a.Name == clicked.Name)) { Sound.Play(TabClick); - Sound.Play(CurrentQueue.Info.QueuedAudio); + Sound.PlayNotification(world.LocalPlayer, "Speech", CurrentQueue.Info.QueuedAudio, world.LocalPlayer.Country.Race); world.IssueOrder(Order.StartProduction(CurrentQueue.self, clicked.Name, Game.GetModifierKeys().HasModifier(Modifiers.Shift) ? 5 : 1)); } @@ -164,13 +164,13 @@ namespace OpenRA.Mods.Cnc.Widgets // instant cancel of things we havent started yet and things that are finished if (first.Paused || first.Done || first.TotalCost == first.RemainingCost) { - Sound.Play(CurrentQueue.Info.CancelledAudio); + Sound.PlayNotification(world.LocalPlayer, "Speech", CurrentQueue.Info.CancelledAudio, world.LocalPlayer.Country.Race); world.IssueOrder(Order.CancelProduction(CurrentQueue.self, clicked.Name, Game.GetModifierKeys().HasModifier(Modifiers.Shift) ? 5 : 1)); } else { - Sound.Play(CurrentQueue.Info.OnHoldAudio); + Sound.PlayNotification(world.LocalPlayer, "Speech", CurrentQueue.Info.OnHoldAudio, world.LocalPlayer.Country.Race); world.IssueOrder(Order.PauseProduction(CurrentQueue.self, clicked.Name, true)); } } diff --git a/OpenRA.Mods.RA/Player/ProductionQueue.cs b/OpenRA.Mods.RA/Player/ProductionQueue.cs index 06a31a31ec..87b12c1075 100755 --- a/OpenRA.Mods.RA/Player/ProductionQueue.cs +++ b/OpenRA.Mods.RA/Player/ProductionQueue.cs @@ -24,11 +24,11 @@ namespace OpenRA.Mods.RA public float BuildSpeed = 0.4f; public readonly int LowPowerSlowdown = 3; - public readonly string ReadyAudio = "unitrdy1.aud"; - public readonly string BlockedAudio = "nobuild1.aud"; - public readonly string QueuedAudio = "train1.aud"; - public readonly string OnHoldAudio = "onhold1.aud"; - public readonly string CancelledAudio = "cancld1.aud"; + public readonly string ReadyAudio = "UnitReady"; + public readonly string BlockedAudio = "NoBuild"; + public readonly string QueuedAudio = "Training"; + public readonly string OnHoldAudio = "OnHold"; + public readonly string CancelledAudio = "Cancelled"; public virtual object Create(ActorInitializer init) { return new ProductionQueue(init.self, init.self.Owner.PlayerActor, this); } } @@ -211,17 +211,15 @@ namespace OpenRA.Mods.RA if (isBuilding && !hasPlayedSound) { - Sound.PlayToPlayer(order.Player, Info.ReadyAudio); - hasPlayedSound = true; + hasPlayedSound = Sound.PlayNotification(self.Owner, "Speech", Info.ReadyAudio, self.Owner.Country.Race); } else if (!isBuilding) { if (BuildUnit(order.TargetString)) - Sound.PlayToPlayer(order.Player, Info.ReadyAudio); + Sound.PlayNotification(self.Owner, "Speech", Info.ReadyAudio, self.Owner.Country.Race); else if (!hasPlayedSound && time > 0) { - Sound.PlayToPlayer(order.Player, Info.BlockedAudio); - hasPlayedSound = true; + hasPlayedSound = Sound.PlayNotification(self.Owner, "Speech", Info.BlockedAudio, self.Owner.Country.Race); } } }))); diff --git a/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs b/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs index 3e578febcf..ea4a28b562 100755 --- a/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs +++ b/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs @@ -374,15 +374,15 @@ namespace OpenRA.Mods.RA.Widgets { // instant cancel of things we havent really started yet, and things that are finished if (producing.Paused || producing.Done || producing.TotalCost == producing.RemainingCost) - { - Sound.Play(CurrentQueue.Info.CancelledAudio); + { + Sound.PlayNotification(world.LocalPlayer, "Speech", CurrentQueue.Info.CancelledAudio, world.LocalPlayer.Country.Race); int numberToCancel = Game.GetModifierKeys().HasModifier(Modifiers.Shift) ? 5 : 1; world.IssueOrder(Order.CancelProduction(CurrentQueue.self, item, numberToCancel)); } else { - Sound.Play(CurrentQueue.Info.OnHoldAudio); + Sound.PlayNotification(world.LocalPlayer, "Speech", CurrentQueue.Info.OnHoldAudio, world.LocalPlayer.Country.Race); world.IssueOrder(Order.PauseProduction(CurrentQueue.self, item, true)); } } @@ -391,7 +391,8 @@ namespace OpenRA.Mods.RA.Widgets void StartProduction( World world, string item ) { - Sound.Play(CurrentQueue.Info.QueuedAudio); + + Sound.PlayNotification(world.LocalPlayer, "Speech", CurrentQueue.Info.QueuedAudio, world.LocalPlayer.Country.Race); world.IssueOrder(Order.StartProduction(CurrentQueue.self, item, Game.GetModifierKeys().HasModifier(Modifiers.Shift) ? 5 : 1)); } diff --git a/mods/cnc/notifications.yaml b/mods/cnc/notifications.yaml index 96665b28cc..2509fe17ce 100644 --- a/mods/cnc/notifications.yaml +++ b/mods/cnc/notifications.yaml @@ -12,6 +12,14 @@ Speech: BaseAttack: baseatk1 HarvesterAttack: Leave: batlcon1 + UnitReady: unitredy + NoBuild: nobuild1 + Training: bldging1 + OnHold: onhold1 + Cancelled: cancel1 + Building: bldging1 + ConstructionComplete: constru1 + Reinforce: reinfor1 Sounds: Notifications: diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml index c84fb9e367..7a4be19e88 100644 --- a/mods/cnc/rules/structures.yaml +++ b/mods/cnc/rules/structures.yaml @@ -29,19 +29,15 @@ FACT: Group: Building BuildSpeed: .4 LowPowerSlowdown: 3 - QueuedAudio: bldging1.aud - ReadyAudio: constru1.aud - OnHoldAudio: onhold1.aud - CancelledAudio: cancel1.aud + QueuedAudio: Building + ReadyAudio: ConstructionComplete ProductionQueue@Defense: Type: Defense Group: Defense BuildSpeed: .4 LowPowerSlowdown: 3 - QueuedAudio: bldging1.aud - ReadyAudio: constru1.aud - OnHoldAudio: onhold1.aud - CancelledAudio: cancel1.aud + QueuedAudio: Building + ReadyAudio: ConstructionComplete BaseBuilding: ProductionBar: @@ -180,10 +176,6 @@ PYLE: Group: Infantry BuildSpeed: .4 LowPowerSlowdown: 3 - QueuedAudio: bldging1.aud - ReadyAudio: unitredy.aud - OnHoldAudio: onhold1.aud - CancelledAudio: cancel1.aud ProductionBar: HAND: @@ -220,10 +212,6 @@ HAND: Group: Infantry BuildSpeed: .4 LowPowerSlowdown: 3 - QueuedAudio: bldging1.aud - ReadyAudio: unitredy.aud - OnHoldAudio: onhold1.aud - CancelledAudio: cancel1.aud ProductionBar: AFLD: @@ -262,10 +250,7 @@ AFLD: Group: Vehicle BuildSpeed: .4 LowPowerSlowdown: 3 - QueuedAudio: bldging1.aud ReadyAudio: - OnHoldAudio: onhold1.aud - CancelledAudio: cancel1.aud ProductionBar: WEAP: @@ -305,10 +290,6 @@ WEAP: Group: Vehicle BuildSpeed: .4 LowPowerSlowdown: 3 - QueuedAudio: bldging1.aud - ReadyAudio: unitredy.aud - OnHoldAudio: onhold1.aud - CancelledAudio: cancel1.aud ProductionBar: HQ: @@ -430,10 +411,6 @@ HPAD: Group: Aircraft BuildSpeed: .4 LowPowerSlowdown: 3 - QueuedAudio: bldging1.aud - ReadyAudio: unitredy.aud - OnHoldAudio: onhold1.aud - CancelledAudio: cancel1.aud ProductionBar: EYE: diff --git a/mods/d2k/TODO b/mods/d2k/TODO index b81d0df29f..82b65b01a6 100644 --- a/mods/d2k/TODO +++ b/mods/d2k/TODO @@ -13,16 +13,13 @@ # add game logic for concrete plates (use terrain overlay from bridges/ressources) # allow placing turrets on walls # make sandworm behave like a moving anti-everything mine (currently not attacking anything) -# allow upgrades # add muzzles and explosions (currently falls back to RA) # create a shellmap (currently just a blank placeholder) # add sonic tank weapon (currently uses tesla) -# starport prices should vary # some transparent tiles (see Atreides Hightech Factory) should be white # gamefile extraction (setup/setup.z) from CD fails # support patch 1.06 gamefiles: DATA.R8 has more frames and currently fails to extract, also featuring new terrain with white houses and new units: grenade thrower, stealth raider icon # put TilesetBuilder.Export into OpenRA.Utility to call the functions directly when extracting game-files (instead of opening a GUI) # group number metrics are off # building offsets wrong (worst for towers) -# spice blooms should explode and create new spice field instead of growing spice -# build light vehicles only at light factory, don't create a new production queue and tab for every new factory except starport \ No newline at end of file +# spice blooms should explode and create new spice field instead of growing spice \ No newline at end of file diff --git a/mods/d2k/notifications.yaml b/mods/d2k/notifications.yaml index e380106b80..35bf5d8aea 100644 --- a/mods/d2k/notifications.yaml +++ b/mods/d2k/notifications.yaml @@ -1,4 +1,4 @@ -# requires Dune 2000/DATA/GAMESFX copied to ~/.openra/Content/d2k +# requires Dune 2000/DATA/GAMESFX copied to $PlatformSupportDir/Content/d2k Speech: DefaultVariant: .AUD @@ -19,6 +19,15 @@ Speech: BaseAttack: ATACK HarvesterAttack: HATTK Leave: ABORT + UnitReady: UNRDY + NoRoom: NROOM + Training: TRAIN + OnHold: HOLD + Cancelled: CANCL + Building: BUILD + BuildingReady: BDRDY + OrderPlaced: ORDER + Reinforce: REINF Sounds: Notifications: diff --git a/mods/d2k/rules/atreides.yaml b/mods/d2k/rules/atreides.yaml index 8165bfc6d2..6586f70451 100644 --- a/mods/d2k/rules/atreides.yaml +++ b/mods/d2k/rules/atreides.yaml @@ -6,18 +6,6 @@ CONYARDA: IntoActor: mcva Offset:1,1 Facing: 270 - ProductionQueue@Building: - QueuedAudio: AI_BUILD.AUD - OnHoldAudio: AI_HOLD.AUD - ReadyAudio: AI_BDRDY.AUD - CancelledAudio: AI_CANCL.AUD - BlockedAudio: AI_NROOM.AUD - ProductionQueue@Defense: - QueuedAudio: AI_BUILD.AUD - OnHoldAudio: AI_HOLD.AUD - ReadyAudio: AI_BDRDY.AUD - CancelledAudio: AI_CANCL.AUD - BlockedAudio: AI_NROOM.AUD PWRA: Inherits: ^POWER @@ -61,41 +49,86 @@ HARVESTERA: Buildable: Prerequisites: heavya,refa Owner: atreides + BuiltAt: heavya RenderUnit: Image: HARVESTER +HARVESTERA.starport: + Inherits: HARVESTERA + Buildable: + Queue: Ship + BuiltAt: starporta + Valued: + Cost: 895 + TRIKEA: Inherits: ^TRIKE Buildable: Prerequisites: lighta Owner: atreides + BuiltAt: lighta RenderUnit: Image: TRIKE +TRIKEA.starport: + Inherits: TRIKEA + Buildable: + Queue: Ship + BuiltAt: starporta + Valued: + Cost: 149 + QUADA: Inherits: ^QUAD Buildable: Prerequisites: lighta Owner: atreides + BuiltAt: lighta RenderUnit: Image: QUAD +QUADA.starport: + Inherits: QUADA + Buildable: + Queue: Ship + BuiltAt: starporta + Valued: + Cost: 295 + SIEGETANKA: Inherits: ^SIEGETANK Buildable: Prerequisites: heavya, radara Owner: atreides + BuiltAt: heavya RenderUnitTurreted: Image: SIEGETANK +SIEGETANKA.starport: + Inherits: SIEGETANKA + Buildable: + Queue: Ship + BuiltAt: starporta + Valued: + Cost: 495 + MISSILETANKA: Inherits: ^MISSILETANK Buildable: Prerequisites: heavya Owner: atreides + BuiltAt: heavya RenderUnit: Image: MISSILETANK +MISSILETANKA.starport: + Inherits: MISSILETANKA + Buildable: + Queue: Ship + BuiltAt: starporta + Valued: + Cost: 599 + CARRYALLA: Inherits: ^CARRYALL Buildable: @@ -105,29 +138,26 @@ CARRYALLA: RenderUnit: Image: CARRYALL +CARRYALLA.starport: + Inherits: CARRYALLA + Buildable: + Queue: Ship + BuiltAt: starporta + Valued: + Cost: 999 + BARRA: Inherits: ^BARRACKS Buildable: Prerequisites: pwra Owner: atreides - ProductionQueue@Infantry: - ReadyAudio: AI_UNRDY.AUD - QueuedAudio:AI_TRAIN.AUD - OnHoldAudio: AI_HOLD.AUD - CancelledAudio: AI_CANCL.AUD - BlockedAudio: AI_NROOM.AUD + HIGHTECHA: Inherits: ^HIGHTECH Buildable: Prerequisites: radara Owner: atreides - ProductionQueue@Plane: - ReadyAudio: AI_UNRDY.AUD - QueuedAudio:AI_TRAIN.AUD - OnHoldAudio: AI_HOLD.AUD - CancelledAudio: AI_CANCL.AUD - BlockedAudio: AI_NROOM.AUD RESEARCHA: Inherits: ^RESEARCH @@ -165,12 +195,6 @@ LIGHTA: Owner: atreides RenderBuildingWarFactory: Image: LIGHTA - ProductionQueue@Vehicle: - ReadyAudio: AI_UNRDY.AUD - QueuedAudio:AI_TRAIN.AUD - OnHoldAudio: AI_HOLD.AUD - CancelledAudio: AI_CANCL.AUD - BlockedAudio: AI_NROOM.AUD HEAVYA: Inherits: ^HEAVY @@ -179,12 +203,6 @@ HEAVYA: Owner: atreides RenderBuildingWarFactory: Image: HEAVYA - ProductionQueue@Vehicle: - ReadyAudio: AI_UNRDY.AUD - QueuedAudio:AI_TRAIN.AUD - OnHoldAudio: AI_HOLD.AUD - CancelledAudio: AI_CANCL.AUD - BlockedAudio: AI_NROOM.AUD RADARA: Inherits: ^RADAR @@ -197,14 +215,6 @@ STARPORTA: Buildable: Prerequisites: radara Owner: atreides - ProductionAirdrop: - ReadyAudio: AI_REINF.AUD - ProductionQueue@Vehicle: - QueuedAudio: AI_ORDER.AUD - ReadyAudio: - OnHoldAudio: AI_HOLD.AUD - CancelledAudio: AI_CANCL.AUD - BlockedAudio: AI_NROOM.AUD REPAIRA: Inherits: ^REPAIR @@ -217,6 +227,7 @@ MCVA: Buildable: Prerequisites: heavya,repaira Owner: atreides + BuiltAt: heavya Transforms: Facing: 10 IntoActor: conyarda @@ -225,11 +236,32 @@ MCVA: RenderUnit: Image: DMCV +MCVA.starport: + Inherits: MCVA + Buildable: + Queue: Ship + BuiltAt: starporta + Valued: + Cost: 1499 + COMBATA: Inherits: ^COMBAT + Tooltip: + Icon: combataicon Buildable: Prerequisites: heavya Owner: atreides + BuiltAt: heavya + RenderUnitTurreted: + Image: COMBATA + +COMBATA.starport: + Inherits: COMBATA + Buildable: + Queue: Ship + BuiltAt: starporta + Valued: + Cost: 595 SONICTANK: Inherits: ^Vehicle @@ -238,11 +270,13 @@ SONICTANK: BuildPaletteOrder: 15 Prerequisites: heavya,researcha Owner: atreides + BuiltAt: heavya Valued: Cost: 1500 Tooltip: Name: Sonic Tank Description: Fires a sound wave\n Strong vs Infantry.\n Weak vs Tanks + Icon: sonictankicon Selectable: Bounds: 30,30 Health: @@ -254,6 +288,7 @@ SONICTANK: RevealsShroud: Range: 7 RenderUnit: + Image: SONICTANK AttackFrontal: PrimaryWeapon: TTankZap PrimaryOffset: 0,0,0,-5 diff --git a/mods/d2k/rules/harkonnen.yaml b/mods/d2k/rules/harkonnen.yaml index 7403908a2d..8e5e40b967 100644 --- a/mods/d2k/rules/harkonnen.yaml +++ b/mods/d2k/rules/harkonnen.yaml @@ -6,18 +6,6 @@ CONYARDH: IntoActor: mcvh Offset:1,1 Facing: 270 - ProductionQueue@Building: - QueuedAudio: HI_BUILD.AUD - OnHoldAudio: HI_HOLD.AUD - ReadyAudio: HI_BDRDY.AUD - CancelledAudio: HI_CANCL.AUD - BlockedAudio: HI_NROOM.AUD - ProductionQueue@Defense: - QueuedAudio: HI_BUILD.AUD - OnHoldAudio: HI_HOLD.AUD - ReadyAudio: HI_BDRDY.AUD - CancelledAudio: HI_CANCL.AUD - BlockedAudio: HI_NROOM.AUD PWRH: Inherits: ^POWER @@ -46,6 +34,14 @@ HARVESTERH: RenderUnit: Image: HARVESTER +HARVESTERH.starport: + Inherits: HARVESTERH + Buildable: + Queue: Ship + BuiltAt: starporth + Valued: + Cost: 895 + TRIKEH: Inherits: ^TRIKE Buildable: @@ -54,6 +50,14 @@ TRIKEH: RenderUnit: Image: TRIKE +TRIKEH.starport: + Inherits: TRIKEH + Buildable: + Queue: Ship + BuiltAt: starporth + Valued: + Cost: 149 + QUADH: Inherits: ^QUAD Buildable: @@ -62,6 +66,14 @@ QUADH: RenderUnit: Image: QUAD +QUADH.starport: + Inherits: QUADH + Buildable: + Queue: Ship + BuiltAt: starporth + Valued: + Cost: 295 + SIEGETANKH: Inherits: ^SIEGETANK Buildable: @@ -70,6 +82,14 @@ SIEGETANKH: RenderUnitTurreted: Image: SIEGETANK +SIEGETANKH.starport: + Inherits: SIEGETANKH + Buildable: + Queue: Ship + BuiltAt: starporta + Valued: + Cost: 495 + MISSILETANKH: Inherits: ^MISSILETANK Buildable: @@ -78,6 +98,14 @@ MISSILETANKH: RenderUnit: Image: MISSILETANK +MISSILETANKH.starport: + Inherits: MISSILETANKH + Buildable: + Queue: Ship + BuiltAt: starporth + Valued: + Cost: 599 + CARRYALLH: Inherits: ^CARRYALL Buildable: @@ -87,17 +115,19 @@ CARRYALLH: RenderUnit: Image: CARRYALL +CARRYALLH.starport: + Inherits: CARRYALLH + Buildable: + Queue: Ship + BuiltAt: starporth + Valued: + Cost: 999 + BARRH: Inherits: ^BARRACKS Buildable: Prerequisites: pwrh Owner: harkonnen - ProductionQueue@Infantry: - ReadyAudio: HI_UNRDY.AUD - QueuedAudio:HI_TRAIN.AUD - OnHoldAudio: HI_HOLD.AUD - CancelledAudio: HI_CANCL.AUD - BlockedAudio: HI_NROOM.AUD GUNTOWERH: Inherits: ^GUNTOWER @@ -122,12 +152,6 @@ HIGHTECHH: Buildable: Prerequisites: radarh Owner: harkonnen - ProductionQueue@Plane: - ReadyAudio: HI_UNRDY.AUD - QueuedAudio:HI_TRAIN.AUD - OnHoldAudio: HI_HOLD.AUD - CancelledAudio: HI_CANCL.AUD - BlockedAudio: HI_NROOM.AUD RESEARCHH: Inherits: ^RESEARCH @@ -168,12 +192,6 @@ LIGHTH: Owner: harkonnen RenderBuildingWarFactory: Image: LIGHTH - ProductionQueue@Vehicle: - ReadyAudio: HI_UNRDY.AUD - QueuedAudio:HI_TRAIN.AUD - OnHoldAudio: HI_HOLD.AUD - CancelledAudio: HI_CANCL.AUD - BlockedAudio: HI_NROOM.AUD HEAVYH: Inherits: ^HEAVY @@ -182,12 +200,6 @@ HEAVYH: Owner: harkonnen RenderBuildingWarFactory: Image: HEAVYH - ProductionQueue@Vehicle: - ReadyAudio: HI_UNRDY.AUD - QueuedAudio:HI_TRAIN.AUD - OnHoldAudio: HI_HOLD.AUD - CancelledAudio: HI_CANCL.AUD - BlockedAudio: HI_NROOM.AUD RADARH: Inherits: ^RADAR @@ -200,14 +212,6 @@ STARPORTH: Buildable: Prerequisites: radarh Owner: harkonnen - ProductionAirdrop: - ReadyAudio: HI_REINF.AUD - ProductionQueue@Vehicle: - QueuedAudio: HI_ORDER.AUD - ReadyAudio: - OnHoldAudio: HI_HOLD.AUD - CancelledAudio: HI_CANCL.AUD - BlockedAudio: HI_NROOM.AUD REPAIRH: Inherits: ^REPAIR @@ -228,11 +232,31 @@ MCVH: RenderUnit: Image: DMCV +MCVH.starport: + Inherits: MCVH + Buildable: + Queue: Ship + BuiltAt: starporth + Valued: + Cost: 1499 + COMBATH: Inherits: ^COMBAT + Tooltip: + Icon: combathicon Buildable: Prerequisites: heavyh Owner: harkonnen + RenderUnitTurreted: + Image: COMBATH + +COMBATH.starport: + Inherits: COMBATH + Buildable: + Queue: Ship + BuiltAt: starporth + Valued: + Cost: 595 DEVAST: Inherits: ^Tank diff --git a/mods/d2k/rules/ordos.yaml b/mods/d2k/rules/ordos.yaml index acf66e5989..cc7b34f06a 100644 --- a/mods/d2k/rules/ordos.yaml +++ b/mods/d2k/rules/ordos.yaml @@ -6,18 +6,6 @@ CONYARDO: IntoActor: mcvo Offset:1,1 Facing: 270 - ProductionQueue@Building: - QueuedAudio: OI_BUILD.AUD - OnHoldAudio: OI_HOLD.AUD - ReadyAudio: OI_BDRDY.AUD - CancelledAudio: OI_CANCL.AUD - BlockedAudio: OI_NROOM.AUD - ProductionQueue@Defense: - QueuedAudio: OI_BUILD.AUD - OnHoldAudio: OI_HOLD.AUD - ReadyAudio: OI_BDRDY.AUD - CancelledAudio: OI_CANCL.AUD - BlockedAudio: OI_NROOM.AUD PWRO: Inherits: ^POWER @@ -43,12 +31,6 @@ BARRO: Buildable: Prerequisites: pwro Owner: ordos - ProductionQueue@Infantry: - ReadyAudio: OI_UNRDY.AUD - QueuedAudio:OI_TRAIN.AUD - OnHoldAudio: OI_HOLD.AUD - CancelledAudio: OI_CANCL.AUD - BlockedAudio: OI_NROOM.AUD GUNTOWERO: Inherits: ^GUNTOWER @@ -73,12 +55,6 @@ HIGHTECHO: Buildable: Prerequisites: radaro Owner: ordos - ProductionQueue@Plane: - ReadyAudio: OI_UNRDY.AUD - QueuedAudio:OI_TRAIN.AUD - OnHoldAudio: OI_HOLD.AUD - CancelledAudio: OI_CANCL.AUD - BlockedAudio: OI_NROOM.AUD RESEARCHO: Inherits: ^RESEARCH @@ -119,12 +95,6 @@ LIGHTO: Owner: ordos RenderBuildingWarFactory: Image: LIGHTO - ProductionQueue@Vehicle: - ReadyAudio: OI_UNRDY.AUD - QueuedAudio:OI_TRAIN.AUD - OnHoldAudio: OI_HOLD.AUD - CancelledAudio: OI_CANCL.AUD - BlockedAudio: OI_NROOM.AUD HEAVYO: Inherits: ^HEAVY @@ -133,12 +103,6 @@ HEAVYO: Owner: ordos RenderBuildingWarFactory: Image: HEAVYO - ProductionQueue@Vehicle: - ReadyAudio: OI_UNRDY.AUD - QueuedAudio:OI_TRAIN.AUD - OnHoldAudio: OI_HOLD.AUD - CancelledAudio: OI_CANCL.AUD - BlockedAudio: OI_NROOM.AUD RADARO: Inherits: ^RADAR @@ -151,14 +115,6 @@ STARPORTO: Buildable: Prerequisites: radaro Owner: ordos - ProductionAirdrop: - ReadyAudio: OI_REINF.AUD - ProductionQueue@Vehicle: - QueuedAudio: OI_ORDER.AUD - ReadyAudio: - OnHoldAudio: OI_HOLD.AUD - CancelledAudio: OI_CANCL.AUD - BlockedAudio: OI_NROOM.AUD REPAIRO: Inherits: ^REPAIR @@ -179,6 +135,14 @@ MCVO: RenderUnit: Image: DMCV +MCVO.starport: + Inherits: MCVO + Buildable: + Queue: Ship + BuiltAt: starporto + Valued: + Cost: 1499 + HARVESTERO: Inherits: ^HARVESTER Buildable: @@ -187,11 +151,31 @@ HARVESTERO: RenderUnit: Image: HARVESTER +HARVESTERO.starport: + Inherits: HARVESTERO + Buildable: + Queue: Ship + BuiltAt: starporto + Valued: + Cost: 895 + COMBATO: Inherits: ^COMBAT + Tooltip: + Icon: combatoicon Buildable: Prerequisites: heavyo Owner: ordos + RenderUnitTurreted: + Image: COMBATO + +COMBATO.starport: + Inherits: COMBATO + Buildable: + Queue: Ship + BuiltAt: starporto + Valued: + Cost: 595 RAIDER: Inherits: ^Vehicle @@ -237,6 +221,14 @@ QUADO: RenderUnit: Image: QUAD +QUADO.starport: + Inherits: QUADO + Buildable: + Queue: Ship + BuiltAt: starporto + Valued: + Cost: 295 + SIEGETANKO: Inherits: ^SIEGETANK Buildable: @@ -245,6 +237,14 @@ SIEGETANKO: RenderUnitTurreted: Image: SIEGETANK +SIEGETANKO.starport: + Inherits: SIEGETANKO + Buildable: + Queue: Ship + BuiltAt: starporto + Valued: + Cost: 495 + MISSILETANKO: Inherits: ^MISSILETANK Buildable: @@ -253,6 +253,14 @@ MISSILETANKO: RenderUnit: Image: MISSILETANK +MISSILETANKO.starport: + Inherits: MISSILETANKO + Buildable: + Queue: Ship + BuiltAt: starporto + Valued: + Cost: 599 + CARRYALLO: Inherits: ^CARRYALL Buildable: @@ -262,6 +270,14 @@ CARRYALLO: RenderUnit: Image: CARRYALL +CARRYALLO.starport: + Inherits: CARRYALLO + Buildable: + Queue: Ship + BuiltAt: starporto + Valued: + Cost: 999 + DEVIATORTANK: Inherits: ^Tank Valued: diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index 7676bb22df..a71a1c2d47 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -21,14 +21,6 @@ Value: 2500 BaseBuilding: ProductionBar: - ProductionQueue@Building: - Type: Building - BuildSpeed: .4 - LowPowerSlowdown: 3 - ProductionQueue@Defense: - Type: Defense - BuildSpeed: .4 - LowPowerSlowdown: 3 ^POWER: Inherits: ^Building @@ -86,10 +78,6 @@ Produces: Infantry PrimaryBuilding: ProductionBar: - ProductionQueue@Infantry: - Type: Infantry - BuildSpeed: .4 - LowPowerSlowdown: 3 ^HIGHTECH: Inherits: ^Building @@ -120,10 +108,6 @@ Produces: Plane PrimaryBuilding: ProductionBar: - ProductionQueue@Plane: - Type: Plane - BuildSpeed: .4 - LowPowerSlowdown: 3 ^RESEARCH: Inherits: ^Building @@ -238,7 +222,7 @@ Cost: 1000 Tooltip: Name: Light Factory - Description: produces light vehicles. + Description: Produces light vehicles. Building: Power: -30 Footprint: xxx xxx @@ -259,10 +243,6 @@ Produces: Vehicle PrimaryBuilding: ProductionBar: - ProductionQueue@Vehicle: - Type: Vehicle - BuildSpeed: .4 - LowPowerSlowdown: 3 ^HEAVY: Inherits: ^Building @@ -273,7 +253,7 @@ Cost: 2000 Tooltip: Name: Heavy Factory - Description: produces tanks + Description: Produces heavy vehicles. Building: Power: -30 Footprint: _x_ xxx xxx @@ -295,10 +275,6 @@ Produces: Vehicle PrimaryBuilding: ProductionBar: - ProductionQueue@Vehicle: - Type: Vehicle - BuildSpeed: .4 - LowPowerSlowdown: 3 ^RADAR: RequiresPower: @@ -331,7 +307,7 @@ Cost: 2000 Tooltip: Name: Starport - Description: Provides a dropzone for vehicle reinforcements + Description: Dropzone for cheap reinforcements Buildable: Queue: Building BuildPaletteOrder: 60 @@ -351,13 +327,10 @@ SpawnOffset: -24,0 ExitCell: 3,1 ProductionAirdrop: - Produces: Vehicle + Produces: Ship ActorType: frigate - ProductionQueue@Vehicle: - Type: Vehicle - BuildSpeed: .4 - LowPowerSlowdown: 3 ProductionBar: + PrimaryBuilding: ^WALL: Buildable: @@ -520,12 +493,6 @@ STARPORTC: Inherits: ^STARPORT ProductionAirdrop: ReadyAudio: - ProductionQueue@Vehicle: - QueuedAudio: - ReadyAudio: - OnHoldAudio: - CancelledAudio: - BlockedAudio: -Buildable: PALACEC: @@ -537,12 +504,6 @@ HEAVYC: -Buildable: RenderBuildingWarFactory: Image: HEAVYC - ProductionQueue@Vehicle: - ReadyAudio: - QueuedAudio: - OnHoldAudio: - CancelledAudio: - BlockedAudio: #4PLATES: # Inherits: ^WALL diff --git a/mods/d2k/rules/system.yaml b/mods/d2k/rules/system.yaml index 0e78f11d9f..7ee0130fd7 100644 --- a/mods/d2k/rules/system.yaml +++ b/mods/d2k/rules/system.yaml @@ -1,5 +1,41 @@ Player: TechTree: + ClassicProductionQueue@Building: + Type: Building + BuildSpeed: .4 + LowPowerSlowdown: 3 + QueuedAudio: Building + ReadyAudio: BuildingReady + BlockedAudio: NoRoom + ClassicProductionQueue@Defense: + Type: Defense + BuildSpeed: .4 + LowPowerSlowdown: 3 + QueuedAudio: Building + ReadyAudio: BuildingReady + BlockedAudio: NoRoom + ClassicProductionQueue@Vehicle: + Type: Vehicle + BuildSpeed: .4 + LowPowerSlowdown: 3 + BlockedAudio: NoRoom + ClassicProductionQueue@Infantry: + Type: Infantry + BuildSpeed: .4 + LowPowerSlowdown: 3 + BlockedAudio: NoRoom + ClassicProductionQueue@Ship: + Type: Ship + BuildSpeed: .4 + LowPowerSlowdown: 3 + BlockedAudio: NoRoom + QueuedAudio: OrderPlaced + ReadyAudio: + ClassicProductionQueue@Plane: + Type: Plane + BuildSpeed: .4 + LowPowerSlowdown: 3 + BlockedAudio: NoRoom PlaceBuilding: SupportPowerManager: ConquestVictoryConditions: diff --git a/mods/d2k/uibits/tabs.png b/mods/d2k/uibits/tabs.png index 20badc72ea..c2842f134f 100644 Binary files a/mods/d2k/uibits/tabs.png and b/mods/d2k/uibits/tabs.png differ diff --git a/mods/ra/notifications.yaml b/mods/ra/notifications.yaml index 1d91e750e7..3f0251cc00 100644 --- a/mods/ra/notifications.yaml +++ b/mods/ra/notifications.yaml @@ -12,6 +12,13 @@ Speech: BaseAttack: baseatk1 HarvesterAttack: Leave: bct1 + UnitReady: unitrdy1 + NoBuild: nobuild1 + Training: train1 + OnHold: onhold1 + Cancelled: cancld1 + Building: abldgin1 + ConstructionComplete: conscmp1 Sounds: Notifications: diff --git a/mods/ra/rules/system.yaml b/mods/ra/rules/system.yaml index 349a0a6653..771df195e3 100644 --- a/mods/ra/rules/system.yaml +++ b/mods/ra/rules/system.yaml @@ -4,14 +4,14 @@ Player: Type: Building BuildSpeed: .4 LowPowerSlowdown: 3 - QueuedAudio: abldgin1.aud - ReadyAudio: conscmp1.aud + QueuedAudio: Building + ReadyAudio: ConstructionComplete ClassicProductionQueue@Defense: Type: Defense BuildSpeed: .4 LowPowerSlowdown: 3 - QueuedAudio: abldgin1.aud - ReadyAudio: conscmp1.aud + QueuedAudio: Building + ReadyAudio: ConstructionComplete ClassicProductionQueue@Vehicle: Type: Vehicle BuildSpeed: .4