diff --git a/OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs b/OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs index e8c8a9f908..6d7df11478 100644 --- a/OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs +++ b/OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs @@ -52,12 +52,12 @@ namespace OpenRA.Mods.Common.Traits [Desc("Notification played when production is complete.", "The filename of the audio is defined per faction in notifications.yaml.")] - public readonly string ReadyAudio = "UnitReady"; + public readonly string ReadyAudio = null; [Desc("Notification played when you can't train another actor", "when the build limit exceeded or the exit is jammed.", "The filename of the audio is defined per faction in notifications.yaml.")] - public readonly string BlockedAudio = "NoBuild"; + public readonly string BlockedAudio = null; [Desc("Notification played when you can't queue another actor", "when the queue length limit is exceeded.", @@ -66,15 +66,15 @@ namespace OpenRA.Mods.Common.Traits [Desc("Notification played when user clicks on the build palette icon.", "The filename of the audio is defined per faction in notifications.yaml.")] - public readonly string QueuedAudio = "Training"; + public readonly string QueuedAudio = null; [Desc("Notification played when player right-clicks on the build palette icon.", "The filename of the audio is defined per faction in notifications.yaml.")] - public readonly string OnHoldAudio = "OnHold"; + public readonly string OnHoldAudio = null; [Desc("Notification played when player right-clicks on a build palette icon that is already on hold.", "The filename of the audio is defined per faction in notifications.yaml.")] - public readonly string CancelledAudio = "Cancelled"; + public readonly string CancelledAudio = null; public virtual object Create(ActorInitializer init) { return new ProductionQueue(init, init.Self.Owner.PlayerActor, this); } diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml index 5556378cd5..88f34eeac8 100644 --- a/mods/cnc/rules/structures.yaml +++ b/mods/cnc/rules/structures.yaml @@ -33,33 +33,45 @@ FACT: Factions: gdi Group: Building LowPowerSlowdown: 2 - QueuedAudio: Building ReadyAudio: ConstructionComplete + BlockedAudio: NoBuild LimitedAudio: BuildingInProgress + QueuedAudio: Building + OnHoldAudio: OnHold + CancelledAudio: Cancelled ProductionQueue@NodBuilding: Type: Building.Nod Factions: nod Group: Building LowPowerSlowdown: 2 - QueuedAudio: Building ReadyAudio: ConstructionComplete + BlockedAudio: NoBuild LimitedAudio: BuildingInProgress + QueuedAudio: Building + OnHoldAudio: OnHold + CancelledAudio: Cancelled ProductionQueue@GDIDefense: Type: Defence.GDI Factions: gdi Group: Defence LowPowerSlowdown: 3 - QueuedAudio: Building ReadyAudio: ConstructionComplete + BlockedAudio: NoBuild LimitedAudio: BuildingInProgress + QueuedAudio: Building + OnHoldAudio: OnHold + CancelledAudio: Cancelled ProductionQueue@NodDefense: Type: Defence.Nod Factions: nod Group: Defence LowPowerSlowdown: 3 - QueuedAudio: Building ReadyAudio: ConstructionComplete + BlockedAudio: NoBuild LimitedAudio: BuildingInProgress + QueuedAudio: Building + OnHoldAudio: OnHold + CancelledAudio: Cancelled BaseBuilding: ProductionBar@BuildingGDI: ProductionType: Building.GDI @@ -301,7 +313,12 @@ PYLE: Type: Infantry.GDI Group: Infantry LowPowerSlowdown: 3 + ReadyAudio: UnitReady + BlockedAudio: NoBuild LimitedAudio: BuildingInProgress + QueuedAudio: Training + OnHoldAudio: OnHold + CancelledAudio: Cancelled ProductionBar: Power: Amount: -20 @@ -346,7 +363,12 @@ HAND: Type: Infantry.Nod Group: Infantry LowPowerSlowdown: 3 + ReadyAudio: UnitReady + BlockedAudio: NoBuild LimitedAudio: BuildingInProgress + QueuedAudio: Training + OnHoldAudio: OnHold + CancelledAudio: Cancelled ProductionBar: Power: Amount: -20 @@ -399,8 +421,11 @@ AFLD: Type: Vehicle.Nod Group: Vehicle LowPowerSlowdown: 3 - ReadyAudio: + BlockedAudio: NoBuild LimitedAudio: BuildingInProgress + QueuedAudio: Training + OnHoldAudio: OnHold + CancelledAudio: Cancelled ProductionBar: Power: Amount: -40 @@ -452,7 +477,12 @@ WEAP: Type: Vehicle.GDI Group: Vehicle LowPowerSlowdown: 3 + ReadyAudio: UnitReady + BlockedAudio: NoBuild LimitedAudio: BuildingInProgress + QueuedAudio: Training + OnHoldAudio: OnHold + CancelledAudio: Cancelled ProductionBar: Power: Amount: -40 @@ -497,13 +527,23 @@ HPAD: Factions: gdi Group: Aircraft LowPowerSlowdown: 3 + ReadyAudio: UnitReady + BlockedAudio: NoBuild LimitedAudio: BuildingInProgress + QueuedAudio: Training + OnHoldAudio: OnHold + CancelledAudio: Cancelled ProductionQueue@Nod: Type: Aircraft.Nod Factions: nod Group: Aircraft LowPowerSlowdown: 3 + ReadyAudio: UnitReady + BlockedAudio: NoBuild LimitedAudio: BuildingInProgress + QueuedAudio: Training + OnHoldAudio: OnHold + CancelledAudio: Cancelled ProductionBar@GDI: ProductionType: Aircraft.GDI ProductionBar@Nod: diff --git a/mods/cnc/rules/tech.yaml b/mods/cnc/rules/tech.yaml index e22582d9df..dc83f9dc6e 100644 --- a/mods/cnc/rules/tech.yaml +++ b/mods/cnc/rules/tech.yaml @@ -97,7 +97,12 @@ BIO: Type: Biolab Group: Infantry LowPowerSlowdown: 3 + ReadyAudio: UnitReady + BlockedAudio: NoBuild LimitedAudio: BuildingInProgress + QueuedAudio: Training + OnHoldAudio: OnHold + CancelledAudio: Cancelled ProductionBar: RallyPoint: Offset: -1,-1 diff --git a/mods/d2k/rules/player.yaml b/mods/d2k/rules/player.yaml index 093b52e412..d6d286a793 100644 --- a/mods/d2k/rules/player.yaml +++ b/mods/d2k/rules/player.yaml @@ -12,29 +12,41 @@ Player: Type: Building BuildDurationModifier: 250 LowPowerSlowdown: 3 - QueuedAudio: Building ReadyAudio: BuildingReady BlockedAudio: NoRoom + QueuedAudio: Building + OnHoldAudio: OnHold + CancelledAudio: Cancelled SpeedUp: true ClassicProductionQueue@Infantry: Type: Infantry BuildDurationModifier: 250 LowPowerSlowdown: 3 + ReadyAudio: UnitReady BlockedAudio: NoRoom + QueuedAudio: Training + OnHoldAudio: OnHold + CancelledAudio: Cancelled SpeedUp: true ClassicProductionQueue@Vehicle: Type: Vehicle BuildDurationModifier: 250 LowPowerSlowdown: 3 - QueuedAudio: Building + ReadyAudio: UnitReady BlockedAudio: NoRoom + QueuedAudio: Building + OnHoldAudio: OnHold + CancelledAudio: Cancelled SpeedUp: true ClassicProductionQueue@Armor: Type: Armor BuildDurationModifier: 250 LowPowerSlowdown: 3 - QueuedAudio: Building + ReadyAudio: UnitReady BlockedAudio: NoRoom + QueuedAudio: Building + OnHoldAudio: OnHold + CancelledAudio: Cancelled SpeedUp: true ClassicProductionQueue@Starport: Type: Starport @@ -42,21 +54,27 @@ Player: LowPowerSlowdown: 1 BlockedAudio: NoRoom QueuedAudio: OrderPlaced - ReadyAudio: + OnHoldAudio: OnHold + CancelledAudio: Cancelled ClassicProductionQueue@Aircraft: Type: Aircraft BuildDurationModifier: 312 LowPowerSlowdown: 3 - QueuedAudio: Building + ReadyAudio: UnitReady BlockedAudio: NoRoom + QueuedAudio: Building + OnHoldAudio: OnHold + CancelledAudio: Cancelled SpeedUp: true ClassicProductionQueue@Upgrade: # Upgrade is defined after others so it won't be automatically selected by ProductionQueueFromSelection. Type: Upgrade BuildDurationModifier: 250 LowPowerSlowdown: 1 - QueuedAudio: Upgrading ReadyAudio: NewOptions BlockedAudio: NoRoom + QueuedAudio: Upgrading + OnHoldAudio: OnHold + CancelledAudio: Cancelled PlaceBuilding: NewOptionsNotification: NewOptions CannotPlaceNotification: BuildingCannotPlaceAudio diff --git a/mods/ra/rules/player.yaml b/mods/ra/rules/player.yaml index 13f82831a9..76300bcb3e 100644 --- a/mods/ra/rules/player.yaml +++ b/mods/ra/rules/player.yaml @@ -11,40 +11,63 @@ Player: ClassicProductionQueue@Building: Type: Building LowPowerSlowdown: 3 - QueuedAudio: Building ReadyAudio: ConstructionComplete + BlockedAudio: NoBuild LimitedAudio: BuildingInProgress + QueuedAudio: Building + OnHoldAudio: OnHold + CancelledAudio: Cancelled SpeedUp: True ClassicProductionQueue@Defense: Type: Defense LowPowerSlowdown: 3 - QueuedAudio: Building ReadyAudio: ConstructionComplete + BlockedAudio: NoBuild LimitedAudio: BuildingInProgress + QueuedAudio: Building + OnHoldAudio: OnHold + CancelledAudio: Cancelled SpeedUp: True ClassicProductionQueue@Vehicle: Type: Vehicle LowPowerSlowdown: 3 - QueuedAudio: Building + ReadyAudio: UnitReady + BlockedAudio: NoBuild LimitedAudio: BuildingInProgress + QueuedAudio: Building + OnHoldAudio: OnHold + CancelledAudio: Cancelled SpeedUp: True BuildTimeSpeedReduction: 100, 75, 60, 50 ClassicProductionQueue@Infantry: Type: Infantry LowPowerSlowdown: 3 + ReadyAudio: UnitReady + BlockedAudio: NoBuild LimitedAudio: BuildingInProgress + QueuedAudio: Training + OnHoldAudio: OnHold + CancelledAudio: Cancelled SpeedUp: True ClassicProductionQueue@Ship: Type: Ship LowPowerSlowdown: 3 - QueuedAudio: Building + ReadyAudio: UnitReady + BlockedAudio: NoBuild LimitedAudio: BuildingInProgress + QueuedAudio: Building + OnHoldAudio: OnHold + CancelledAudio: Cancelled SpeedUp: True ClassicProductionQueue@Aircraft: Type: Aircraft LowPowerSlowdown: 3 - QueuedAudio: Building + ReadyAudio: UnitReady + BlockedAudio: NoBuild LimitedAudio: BuildingInProgress + QueuedAudio: Building + OnHoldAudio: OnHold + CancelledAudio: Cancelled SpeedUp: True PlaceBuilding: NewOptionsNotification: NewOptions diff --git a/mods/ts/rules/player.yaml b/mods/ts/rules/player.yaml index a39c361479..d3542fbf49 100644 --- a/mods/ts/rules/player.yaml +++ b/mods/ts/rules/player.yaml @@ -13,40 +13,51 @@ Player: Type: Building BuildDurationModifier: 120 LowPowerSlowdown: 3 - QueuedAudio: Building ReadyAudio: ConstructionComplete - BlockedAudio: LimitedAudio: BuildingInProgress + QueuedAudio: Building + OnHoldAudio: OnHold + CancelledAudio: Cancelled SpeedUp: True ClassicProductionQueue@Defense: Type: Defense BuildDurationModifier: 120 LowPowerSlowdown: 3 - QueuedAudio: Building ReadyAudio: ConstructionComplete - BlockedAudio: LimitedAudio: BuildingInProgress + QueuedAudio: Building + OnHoldAudio: OnHold + CancelledAudio: Cancelled SpeedUp: True ClassicProductionQueue@Vehicle: Type: Vehicle BuildDurationModifier: 120 LowPowerSlowdown: 3 - BlockedAudio: + ReadyAudio: UnitReady LimitedAudio: BuildingInProgress + QueuedAudio: Training + OnHoldAudio: OnHold + CancelledAudio: Cancelled SpeedUp: True ClassicProductionQueue@Infantry: Type: Infantry BuildDurationModifier: 120 LowPowerSlowdown: 3 - BlockedAudio: + ReadyAudio: UnitReady LimitedAudio: BuildingInProgress + QueuedAudio: Training + OnHoldAudio: OnHold + CancelledAudio: Cancelled SpeedUp: True ClassicProductionQueue@Air: Type: Air BuildDurationModifier: 120 LowPowerSlowdown: 3 - BlockedAudio: + ReadyAudio: UnitReady LimitedAudio: BuildingInProgress + QueuedAudio: Training + OnHoldAudio: OnHold + CancelledAudio: Cancelled SpeedUp: True PlaceBuilding: NewOptionsNotification: NewOptions