epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved EvaAlerts from player to world

Browse Source
This commit is contained in:
Chris Forbes
2010-03-17 19:47:52 +13:00
parent ed2e70eb9c
commit f351285246
11 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Chat.cs
View File

@@ -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<EvaAlertsInfo>();
var eva = Game.world.WorldActor.Info.Traits.Get<EvaAlertsInfo>();
Sound.Play(eva.ChatBeep);
while (recentLines.Count > logLength) recentLines.RemoveAt(0);
}

12
OpenRA.Game/Chrome.cs
View File

@@ -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<EvaAlertsInfo>();
var eva = Game.world.WorldActor.Info.Traits.Get<EvaAlertsInfo>();
// 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<EvaAlertsInfo>();
var eva = Game.world.WorldActor.Info.Traits.Get<EvaAlertsInfo>();
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<EvaAlertsInfo>();
var eva = Game.world.WorldActor.Info.Traits.Get<EvaAlertsInfo>();
// 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<EvaAlertsInfo>();
var eva = world.WorldActor.Info.Traits.Get<EvaAlertsInfo>();
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<EvaAlertsInfo>();
var eva = world.WorldActor.Info.Traits.Get<EvaAlertsInfo>();
var unit = Rules.Info[item];
Sound.Play(unit.Traits.Contains<BuildingInfo>() ? 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<Traits.ProductionQueue>();
var eva = player.PlayerActor.Info.Traits.Get<EvaAlertsInfo>();
var eva = world.WorldActor.Info.Traits.Get<EvaAlertsInfo>();
var producing = queue.AllItems(unit.Category).FirstOrDefault( a => a.Item == item );
Sound.Play(eva.TabClick);

2
OpenRA.Game/Orders/PlaceBuildingOrderGenerator.cs
View File

@@ -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<EvaAlertsInfo>();
var eva = world.WorldActor.Info.Traits.Get<EvaAlertsInfo>();
Sound.Play(eva.BuildingCannotPlaceAudio);
yield break;
}

6
OpenRA.Game/Player.cs
View File

@@ -107,7 +107,7 @@ namespace OpenRA
if (PowerProvided - PowerDrained < 0)
if (PowerProvided - PowerDrained != oldBalance)
GiveAdvice(PlayerActor.Info.Traits.Get<EvaAlertsInfo>().LowPower);
GiveAdvice(World.WorldActor.Info.Traits.Get<EvaAlertsInfo>().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<EvaAlertsInfo>().SilosNeeded); // silos needed
GiveAdvice(World.WorldActor.Info.Traits.Get<EvaAlertsInfo>().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<EvaAlertsInfo>();
var eva = World.WorldActor.Info.Traits.Get<EvaAlertsInfo>();
if (DisplayCash < totalMoney)
{
DisplayCash += move;

2
OpenRA.Game/Traits/CanPowerDown.cs
View File

@@ -43,7 +43,7 @@ namespace OpenRA.Traits
if (order.OrderString == "PowerDown")
{
IsDisabled = !IsDisabled;
var eva = self.Owner.PlayerActor.Info.Traits.Get<EvaAlertsInfo>();
var eva = self.World.WorldActor.Info.Traits.Get<EvaAlertsInfo>();
Sound.PlayToPlayer(self.Owner, IsDisabled ? eva.EnablePower : eva.DisablePower);
}
}

2
OpenRA.Game/Traits/Player/ProductionQueue.cs
View File

@@ -74,7 +74,7 @@ namespace OpenRA.Traits
var isBuilding = unit.Traits.Contains<BuildingInfo>();
if( !hasPlayedSound )
{
var eva = self.Info.Traits.Get<EvaAlertsInfo>();
var eva = self.World.WorldActor.Info.Traits.Get<EvaAlertsInfo>();
Sound.PlayToPlayer( order.Player, isBuilding ? eva.BuildingReadyAudio : eva.UnitReadyAudio );
hasPlayedSound = true;
}

2
OpenRA.Game/Traits/Production.cs
View File

@@ -138,7 +138,7 @@ namespace OpenRA.Traits
}
isPrimary = true;
var eva = self.Owner.PlayerActor.Info.Traits.Get<EvaAlertsInfo>();
var eva = self.World.WorldActor.Info.Traits.Get<EvaAlertsInfo>();
Sound.PlayToPlayer(self.Owner,eva.PrimaryBuildingSelected);
}
}

2
OpenRA.Game/Traits/StoresOre.cs
View File

@@ -37,7 +37,7 @@ namespace OpenRA.Traits
self.Owner.TakeCash(toSteal);
thief.Owner.GiveCash(toSteal);
var eva = thief.Owner.PlayerActor.Info.Traits.Get<EvaAlertsInfo>();
var eva = thief.World.WorldActor.Info.Traits.Get<EvaAlertsInfo>();
Sound.PlayToPlayer(thief.Owner, eva.CreditsStolen);
}

2
OpenRA.Game/Traits/Unit.cs
View File

@@ -40,7 +40,7 @@ namespace OpenRA.Traits
public void Damaged(Actor self, AttackInfo e)
{
var eva = self.Owner.PlayerActor.Info.Traits.Get<EvaAlertsInfo>();
var eva = self.World.WorldActor.Info.Traits.Get<EvaAlertsInfo>();
if (e.DamageState == DamageState.Dead)
Sound.PlayToPlayer(self.Owner,
self.Info.Traits.Get<OwnedActorInfo>().WaterBound ? eva.NavalUnitLost : eva.UnitLost);

44
mods/cnc/system.yaml
View File

@@ -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:
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

2
mods/ra/rules.yaml
View File

@@ -1,6 +1,5 @@
Player:
ProductionQueue:
EvaAlerts:
PlaceBuilding:
GpsPower:
Image: gpssicon
@@ -267,6 +266,7 @@ World:
MapColors:temperat.col
SpawnMapActors:
SpawnDefaultUnits:
EvaAlerts:
MGG:
GeneratesGap: