From f3512852468846c5a8b1c1224f0af77b7f12c071 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Wed, 17 Mar 2010 19:47:52 +1300 Subject: [PATCH] moved EvaAlerts from player to world --- OpenRA.Game/Chat.cs | 2 +- OpenRA.Game/Chrome.cs | 12 ++--- .../Orders/PlaceBuildingOrderGenerator.cs | 2 +- OpenRA.Game/Player.cs | 6 +-- OpenRA.Game/Traits/CanPowerDown.cs | 2 +- OpenRA.Game/Traits/Player/ProductionQueue.cs | 2 +- OpenRA.Game/Traits/Production.cs | 2 +- OpenRA.Game/Traits/StoresOre.cs | 2 +- OpenRA.Game/Traits/Unit.cs | 2 +- mods/cnc/system.yaml | 44 +++++++++---------- mods/ra/rules.yaml | 2 +- 11 files changed, 39 insertions(+), 39 deletions(-) diff --git a/OpenRA.Game/Chat.cs b/OpenRA.Game/Chat.cs index 3ee10d0626..3dacbdd1d3 100644 --- a/OpenRA.Game/Chat.cs +++ b/OpenRA.Game/Chat.cs @@ -69,7 +69,7 @@ namespace OpenRA { Log.Write( "Chat: {0}: {1}", from, text ); recentLines.Add(Tuple.New(c, from, text)); - var eva = Game.world.LocalPlayer.PlayerActor.Info.Traits.Get(); + var eva = Game.world.WorldActor.Info.Traits.Get(); Sound.Play(eva.ChatBeep); while (recentLines.Count > logLength) recentLines.RemoveAt(0); } diff --git a/OpenRA.Game/Chrome.cs b/OpenRA.Game/Chrome.cs index 51057fc2d9..3ce6b5626a 100644 --- a/OpenRA.Game/Chrome.cs +++ b/OpenRA.Game/Chrome.cs @@ -542,7 +542,7 @@ namespace OpenRA if (radarAnimationFrame <= radarSlideAnimationLength) radarOrigin = float2.Lerp(radarClosedOrigin, radarOpenOrigin, radarAnimationFrame * 1.0f / radarSlideAnimationLength); - var eva = Game.world.LocalPlayer.PlayerActor.Info.Traits.Get(); + var eva = Game.world.WorldActor.Info.Traits.Get(); // Play radar-on sound at the start of the activate anim (open) if (radarAnimationFrame == radarSlideAnimationLength && hasRadar) @@ -626,7 +626,7 @@ namespace OpenRA void HandleTabClick(string button) { - var eva = Game.world.LocalPlayer.PlayerActor.Info.Traits.Get(); + var eva = Game.world.WorldActor.Info.Traits.Get(); Sound.Play(eva.TabClick); var wasOpen = paletteOpen; paletteOpen = (currentTab == button && wasOpen) ? false : true; @@ -838,7 +838,7 @@ namespace OpenRA if (paletteAnimationFrame <= paletteAnimationLength) paletteOrigin = float2.Lerp(paletteClosedOrigin, paletteOpenOrigin, paletteAnimationFrame * 1.0f / paletteAnimationLength); - var eva = Game.world.LocalPlayer.PlayerActor.Info.Traits.Get(); + var eva = Game.world.WorldActor.Info.Traits.Get(); // Play palette-open sound at the start of the activate anim (open) if (paletteAnimationFrame == 1 && paletteOpen) @@ -949,7 +949,7 @@ namespace OpenRA var closureItemName = item.Name; - var eva = world.LocalPlayer.PlayerActor.Info.Traits.Get(); + var eva = world.WorldActor.Info.Traits.Get(); AddButton(rect, buildableItems.Contains(item.Name) ? isLmb => HandleBuildPalette(world, closureItemName, isLmb) @@ -988,7 +988,7 @@ namespace OpenRA void StartProduction( World world, string item ) { - var eva = world.LocalPlayer.PlayerActor.Info.Traits.Get(); + var eva = world.WorldActor.Info.Traits.Get(); var unit = Rules.Info[item]; Sound.Play(unit.Traits.Contains() ? eva.BuildingSelectAudio : eva.UnitSelectAudio); @@ -1000,7 +1000,7 @@ namespace OpenRA var player = world.LocalPlayer; var unit = Rules.Info[item]; var queue = player.PlayerActor.traits.Get(); - var eva = player.PlayerActor.Info.Traits.Get(); + var eva = world.WorldActor.Info.Traits.Get(); var producing = queue.AllItems(unit.Category).FirstOrDefault( a => a.Item == item ); Sound.Play(eva.TabClick); diff --git a/OpenRA.Game/Orders/PlaceBuildingOrderGenerator.cs b/OpenRA.Game/Orders/PlaceBuildingOrderGenerator.cs index 98359589a0..a04656e526 100644 --- a/OpenRA.Game/Orders/PlaceBuildingOrderGenerator.cs +++ b/OpenRA.Game/Orders/PlaceBuildingOrderGenerator.cs @@ -52,7 +52,7 @@ namespace OpenRA.Orders if (!world.CanPlaceBuilding( Building, BuildingInfo, topLeft, null) || !world.IsCloseEnoughToBase(Producer.Owner, Building, BuildingInfo, topLeft)) { - var eva = world.LocalPlayer.PlayerActor.Info.Traits.Get(); + var eva = world.WorldActor.Info.Traits.Get(); Sound.Play(eva.BuildingCannotPlaceAudio); yield break; } diff --git a/OpenRA.Game/Player.cs b/OpenRA.Game/Player.cs index a8488ab323..8d8a419199 100644 --- a/OpenRA.Game/Player.cs +++ b/OpenRA.Game/Player.cs @@ -107,7 +107,7 @@ namespace OpenRA if (PowerProvided - PowerDrained < 0) if (PowerProvided - PowerDrained != oldBalance) - GiveAdvice(PlayerActor.Info.Traits.Get().LowPower); + GiveAdvice(World.WorldActor.Info.Traits.Get().LowPower); } public float GetSiloFullness() @@ -146,7 +146,7 @@ namespace OpenRA Ore = OreCapacity; // trim off the overflow. if (Ore > .8 * OreCapacity) - GiveAdvice(PlayerActor.Info.Traits.Get().SilosNeeded); // silos needed + GiveAdvice(World.WorldActor.Info.Traits.Get().SilosNeeded); } public bool TakeCash( int num ) @@ -178,7 +178,7 @@ namespace OpenRA var move = Math.Min(Math.Max((int)(diff * displayCashFracPerFrame), displayCashDeltaPerFrame), diff); - var eva = PlayerActor.Info.Traits.Get(); + var eva = World.WorldActor.Info.Traits.Get(); if (DisplayCash < totalMoney) { DisplayCash += move; diff --git a/OpenRA.Game/Traits/CanPowerDown.cs b/OpenRA.Game/Traits/CanPowerDown.cs index ef2b007d85..785c010572 100644 --- a/OpenRA.Game/Traits/CanPowerDown.cs +++ b/OpenRA.Game/Traits/CanPowerDown.cs @@ -43,7 +43,7 @@ namespace OpenRA.Traits if (order.OrderString == "PowerDown") { IsDisabled = !IsDisabled; - var eva = self.Owner.PlayerActor.Info.Traits.Get(); + var eva = self.World.WorldActor.Info.Traits.Get(); Sound.PlayToPlayer(self.Owner, IsDisabled ? eva.EnablePower : eva.DisablePower); } } diff --git a/OpenRA.Game/Traits/Player/ProductionQueue.cs b/OpenRA.Game/Traits/Player/ProductionQueue.cs index 1a58637d8f..7d1773464d 100644 --- a/OpenRA.Game/Traits/Player/ProductionQueue.cs +++ b/OpenRA.Game/Traits/Player/ProductionQueue.cs @@ -74,7 +74,7 @@ namespace OpenRA.Traits var isBuilding = unit.Traits.Contains(); if( !hasPlayedSound ) { - var eva = self.Info.Traits.Get(); + var eva = self.World.WorldActor.Info.Traits.Get(); Sound.PlayToPlayer( order.Player, isBuilding ? eva.BuildingReadyAudio : eva.UnitReadyAudio ); hasPlayedSound = true; } diff --git a/OpenRA.Game/Traits/Production.cs b/OpenRA.Game/Traits/Production.cs index efe9b236e5..5a2a7b89d8 100755 --- a/OpenRA.Game/Traits/Production.cs +++ b/OpenRA.Game/Traits/Production.cs @@ -138,7 +138,7 @@ namespace OpenRA.Traits } isPrimary = true; - var eva = self.Owner.PlayerActor.Info.Traits.Get(); + var eva = self.World.WorldActor.Info.Traits.Get(); Sound.PlayToPlayer(self.Owner,eva.PrimaryBuildingSelected); } } diff --git a/OpenRA.Game/Traits/StoresOre.cs b/OpenRA.Game/Traits/StoresOre.cs index 77356c176b..aa9452445a 100644 --- a/OpenRA.Game/Traits/StoresOre.cs +++ b/OpenRA.Game/Traits/StoresOre.cs @@ -37,7 +37,7 @@ namespace OpenRA.Traits self.Owner.TakeCash(toSteal); thief.Owner.GiveCash(toSteal); - var eva = thief.Owner.PlayerActor.Info.Traits.Get(); + var eva = thief.World.WorldActor.Info.Traits.Get(); Sound.PlayToPlayer(thief.Owner, eva.CreditsStolen); } diff --git a/OpenRA.Game/Traits/Unit.cs b/OpenRA.Game/Traits/Unit.cs index 16e0558d4a..d7298546a0 100755 --- a/OpenRA.Game/Traits/Unit.cs +++ b/OpenRA.Game/Traits/Unit.cs @@ -40,7 +40,7 @@ namespace OpenRA.Traits public void Damaged(Actor self, AttackInfo e) { - var eva = self.Owner.PlayerActor.Info.Traits.Get(); + var eva = self.World.WorldActor.Info.Traits.Get(); if (e.DamageState == DamageState.Dead) Sound.PlayToPlayer(self.Owner, self.Info.Traits.Get().WaterBound ? eva.NavalUnitLost : eva.UnitLost); diff --git a/mods/cnc/system.yaml b/mods/cnc/system.yaml index 0b538cf709..af81741cc8 100644 --- a/mods/cnc/system.yaml +++ b/mods/cnc/system.yaml @@ -1,26 +1,5 @@ Player: ProductionQueue: - EvaAlerts: - TabClick: button.aud - ChatBeep: beepy2.aud - RadarUp: comcntr1.aud - RadarDown: powrdn1.aud - BuildPaletteOpen: appear1.aud - BuildPaletteClose: appear1.aud - BuildingSelectAudio: bldging1.aud - BuildingReadyAudio: constru1.aud - BuildingCannotPlaceAudio: deploy1.aud - UnitSelectAudio: bldging1.aud - UnitReadyAudio: unitredy.aud - OnHoldAudio: onhold1.aud - CancelledAudio: cancel1.aud - CashTickUp: tone15.aud - CashTickDown: - LowPower: lopower1.aud - SilosNeeded: silos1.aud - UnitLost: unitlost.aud - NavalUnitLost: unitlost.aud - PrimaryBuildingSelected: pribldg1.aud PlaceBuilding: World: @@ -208,4 +187,25 @@ World: GrowthInterval: 1 SpreadInterval: 6 SpawnMapActors: - SpawnDefaultUnits: \ No newline at end of file + SpawnDefaultUnits: + EvaAlerts: + TabClick: button.aud + ChatBeep: beepy2.aud + RadarUp: comcntr1.aud + RadarDown: powrdn1.aud + BuildPaletteOpen: appear1.aud + BuildPaletteClose: appear1.aud + BuildingSelectAudio: bldging1.aud + BuildingReadyAudio: constru1.aud + BuildingCannotPlaceAudio: deploy1.aud + UnitSelectAudio: bldging1.aud + UnitReadyAudio: unitredy.aud + OnHoldAudio: onhold1.aud + CancelledAudio: cancel1.aud + CashTickUp: tone15.aud + CashTickDown: + LowPower: lopower1.aud + SilosNeeded: silos1.aud + UnitLost: unitlost.aud + NavalUnitLost: unitlost.aud + PrimaryBuildingSelected: pribldg1.aud \ No newline at end of file diff --git a/mods/ra/rules.yaml b/mods/ra/rules.yaml index 7662fb485d..7623d73202 100644 --- a/mods/ra/rules.yaml +++ b/mods/ra/rules.yaml @@ -1,6 +1,5 @@ Player: ProductionQueue: - EvaAlerts: PlaceBuilding: GpsPower: Image: gpssicon @@ -267,6 +266,7 @@ World: MapColors:temperat.col SpawnMapActors: SpawnDefaultUnits: + EvaAlerts: MGG: GeneratesGap: