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

Merge pull request #3263 from Mailaender/alliance-checks

Browse Source 
Removed inconstencies in alliance checks
This commit is contained in:
Chris Forbes
2013-05-13 22:50:17 -07:00
parent b301bc1d79 f05760b986
commit e8db3c2e77
11 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.RA/Activities/Sell.cs
View File

@@ -31,7 +31,7 @@ namespace OpenRA.Mods.RA.Activities
foreach (var ns in self.TraitsImplementing<INotifySold>()) foreach (var ns in self.TraitsImplementing<INotifySold>())
ns.Sold(self); ns.Sold(self);
if (refund > 0 && self.World.LocalPlayer != null && self.Owner.Stances[self.World.LocalPlayer] == Stance.Ally) if (refund > 0 && self.Owner.IsAlliedWith(self.World.RenderPlayer))
self.World.AddFrameEndTask(w => w.Add(new CashTick(refund, 30, 2, self.CenterLocation, self.Owner.Color.RGB))); self.World.AddFrameEndTask(w => w.Add(new CashTick(refund, 30, 2, self.CenterLocation, self.Owner.Color.RGB)));
self.Destroy(); self.Destroy();
@@ -39,6 +39,6 @@ namespace OpenRA.Mods.RA.Activities
} }
// Cannot be cancelled // Cannot be cancelled
public override void Cancel( Actor self ) { } public override void Cancel(Actor self) { }
} }
} }

2
OpenRA.Mods.RA/Effects/CashTick.cs
View File

@@ -29,7 +29,7 @@ namespace OpenRA.Mods.RA.Effects
static string FormatCashAmount(int x) { return "{0}${1}".F(x < 0 ? "-" : "+", x); } static string FormatCashAmount(int x) { return "{0}${1}".F(x < 0 ? "-" : "+", x); }
public CashTick(int value, int lifetime, int velocity, PPos pos, Color color) public CashTick(int value, int lifetime, int velocity, PPos pos, Color color)
: this( FormatCashAmount(value), lifetime, velocity, pos, color ) { } : this(FormatCashAmount(value), lifetime, velocity, pos, color) { }
public CashTick(string value, int lifetime, int velocity, PPos pos, Color color) public CashTick(string value, int lifetime, int velocity, PPos pos, Color color)
{ {

9
OpenRA.Mods.RA/Effects/GpsDot.cs
View File

@@ -45,8 +45,6 @@ namespace OpenRA.Mods.RA.Effects
anim.PlayRepeating(info.String); anim.PlayRepeating(info.String);
self.World.AddFrameEndTask(w => w.Add(this)); self.World.AddFrameEndTask(w => w.Add(this));
if (self.World.LocalPlayer != null)
watcher = self.World.LocalPlayer.PlayerActor.Trait<GpsWatcher>();
} }
bool firstTick = true; bool firstTick = true;
@@ -55,7 +53,7 @@ namespace OpenRA.Mods.RA.Effects
if (self.Destroyed) if (self.Destroyed)
world.AddFrameEndTask(w => w.Remove(this)); world.AddFrameEndTask(w => w.Remove(this));
if (world.LocalPlayer == null || !self.IsInWorld || self.Destroyed) if (!self.IsInWorld || self.Destroyed)
return; return;
// Can be granted at runtime via a crate, so can't cache // Can be granted at runtime via a crate, so can't cache
@@ -68,6 +66,10 @@ namespace OpenRA.Mods.RA.Effects
firstTick = false; firstTick = false;
} }
// Can change with the Shroud selector for observers so don't cache.
if (self.World.RenderPlayer != null)
watcher = self.World.RenderPlayer.PlayerActor.Trait<GpsWatcher>();
var hasGps = (watcher != null && (watcher.Granted || watcher.GrantedAllies)); var hasGps = (watcher != null && (watcher.Granted || watcher.GrantedAllies));
var hasDot = (huf != null && !huf.IsVisible(self, self.World.RenderPlayer)); var hasDot = (huf != null && !huf.IsVisible(self, self.World.RenderPlayer));
var dotHidden = (cloak != null && cloak.Cloaked) || (spy != null && spy.Disguised); var dotHidden = (cloak != null && cloak.Cloaked) || (spy != null && spy.Disguised);
@@ -84,7 +86,6 @@ namespace OpenRA.Mods.RA.Effects
var palette = wr.Palette(info.IndicatorPalettePrefix+self.Owner.InternalName); var palette = wr.Palette(info.IndicatorPalettePrefix+self.Owner.InternalName);
yield return new Renderable(anim.Image, p.ToFloat2() - 0.5f * anim.Image.size, palette, p.Y) yield return new Renderable(anim.Image, p.ToFloat2() - 0.5f * anim.Image.size, palette, p.Y)
.WithScale(1.5f); .WithScale(1.5f);
} }
} }
} }

2
OpenRA.Mods.RA/Effects/PowerdownIndicator.cs
View File

@@ -36,7 +36,7 @@ namespace OpenRA.Mods.RA.Effects
public IEnumerable<Renderable> Render(WorldRenderer wr) public IEnumerable<Renderable> Render(WorldRenderer wr)
{ {
if (!a.Destroyed && (a.World.LocalPlayer == null || a.Owner.Stances[a.Owner.World.LocalPlayer] == Stance.Ally)) if (!a.Destroyed && a.Owner.IsAlliedWith(a.World.RenderPlayer))
yield return new Renderable(anim.Image, a.CenterLocation.ToFloat2() - .5f * anim.Image.size, yield return new Renderable(anim.Image, a.CenterLocation.ToFloat2() - .5f * anim.Image.size,
wr.Palette("chrome"), (int)a.CenterLocation.Y); wr.Palette("chrome"), (int)a.CenterLocation.Y);
} }

2
OpenRA.Mods.RA/GainsExperience.cs
View File

@@ -101,7 +101,7 @@ namespace OpenRA.Mods.RA
public IEnumerable<Renderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<Renderable> r) public IEnumerable<Renderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<Renderable> r)
{ {
// TODO: Make this consistent with everything else that adds animations to RenderSimple. // TODO: Make this consistent with everything else that adds animations to RenderSimple.
if ((self.Owner == self.World.LocalPlayer || self.World.LocalPlayer == null) && Level > 0) if (self.Owner.IsAlliedWith(self.World.RenderPlayer) && Level > 0)
return InnerModifyRender(self, wr, r); return InnerModifyRender(self, wr, r);
else else
return r; return r;

2
OpenRA.Mods.RA/GivesBounty.cs
View File

@@ -53,7 +53,7 @@ namespace OpenRA.Mods.RA
// 2 hundreds because of GetMultiplier and info.Percentage. // 2 hundreds because of GetMultiplier and info.Percentage.
var bounty = cost * GetMultiplier(self) * info.Percentage / 10000; var bounty = cost * GetMultiplier(self) * info.Percentage / 10000;
if (bounty > 0 && e.Attacker.World.LocalPlayer != null && e.Attacker.Owner.Stances[e.Attacker.World.LocalPlayer] == Stance.Ally) if (bounty > 0 && e.Attacker.Owner.IsAlliedWith(self.World.RenderPlayer))
e.Attacker.World.AddFrameEndTask(w => w.Add(new CashTick(bounty, 20, 1, self.CenterLocation, e.Attacker.Owner.Color.RGB))); e.Attacker.World.AddFrameEndTask(w => w.Add(new CashTick(bounty, 20, 1, self.CenterLocation, e.Attacker.Owner.Color.RGB)));
e.Attacker.Owner.PlayerActor.Trait<PlayerResources>().GiveCash(bounty); e.Attacker.Owner.PlayerActor.Trait<PlayerResources>().GiveCash(bounty);

2
OpenRA.Mods.RA/OreRefinery.cs
View File

@@ -92,7 +92,7 @@ namespace OpenRA.Mods.RA
if (Info.ShowTicks && currentDisplayValue > 0 && --currentDisplayTick <= 0) if (Info.ShowTicks && currentDisplayValue > 0 && --currentDisplayTick <= 0)
{ {
var temp = currentDisplayValue; var temp = currentDisplayValue;
if (self.World.LocalPlayer != null && self.Owner.Stances[self.World.LocalPlayer] == Stance.Ally) if (self.Owner.IsAlliedWith(self.World.RenderPlayer))
self.World.AddFrameEndTask(w => w.Add(new CashTick(temp, Info.TickLifetime, Info.TickVelocity, self.CenterLocation, self.Owner.Color.RGB))); self.World.AddFrameEndTask(w => w.Add(new CashTick(temp, Info.TickLifetime, Info.TickVelocity, self.CenterLocation, self.Owner.Color.RGB)));
currentDisplayTick = Info.TickRate; currentDisplayTick = Info.TickRate;
currentDisplayValue = 0; currentDisplayValue = 0;

3
OpenRA.Mods.RA/Spy.cs
View File

@@ -115,8 +115,7 @@ namespace OpenRA.Mods.RA
public Color RadarColorOverride(Actor self) public Color RadarColorOverride(Actor self)
{ {
if (!Disguised || self.World.LocalPlayer == null || if (!Disguised || self.Owner.IsAlliedWith(self.World.RenderPlayer))
self.Owner.Stances[self.World.LocalPlayer] == Stance.Ally)
return self.Owner.Color.RGB; return self.Owner.Color.RGB;
return disguisedAsPlayer.Color.RGB; return disguisedAsPlayer.Color.RGB;

9
OpenRA.Mods.RA/SupportPowers/GpsPower.cs
View File

@@ -31,7 +31,7 @@ namespace OpenRA.Mods.RA
List<Actor> actors = new List<Actor> { }; List<Actor> actors = new List<Actor> { };
public GpsWatcher( Player owner ) { this.owner = owner; } public GpsWatcher(Player owner) { this.owner = owner; }
public void GpsRem(Actor atek) public void GpsRem(Actor atek)
{ {
@@ -62,16 +62,15 @@ namespace OpenRA.Mods.RA
foreach (TraitPair<GpsWatcher> i in atek.World.ActorsWithTrait<GpsWatcher>()) foreach (TraitPair<GpsWatcher> i in atek.World.ActorsWithTrait<GpsWatcher>())
i.Trait.RefreshGranted(); i.Trait.RefreshGranted();
if ((Granted || GrantedAllies) && atek.World.LocalPlayer != null && (atek.World.LocalPlayer.Stances[atek.Owner] == Stance.Ally)) if ((Granted || GrantedAllies) && atek.Owner.IsAlliedWith(atek.World.RenderPlayer))
atek.Owner.Shroud.ExploreAll(atek.World); atek.Owner.Shroud.ExploreAll(atek.World);
} }
void RefreshGranted() void RefreshGranted()
{ {
Granted = (actors.Count > 0 && Launched); Granted = (actors.Count > 0 && Launched);
GrantedAllies = owner.World.ActorsWithTrait<GpsWatcher>().Any(p => GrantedAllies = owner.World.ActorsWithTrait<GpsWatcher>().Any(p => p.Actor.Owner.IsAlliedWith(owner) && p.Trait.Granted);
p.Actor.Owner.Stances[owner] == Stance.Ally && p.Trait.Granted);
if (Granted || GrantedAllies) if (Granted || GrantedAllies)
owner.Shroud.ExploreAll(owner.World); owner.Shroud.ExploreAll(owner.World);
} }

2
OpenRA.Mods.RA/SupportPowers/SupportPowerChargeBar.cs
View File

@@ -27,7 +27,7 @@ namespace OpenRA.Mods.RA
public float GetValue() public float GetValue()
{ {
// only people we like should see our charge status. // only people we like should see our charge status.
if (self.World.LocalPlayer != null && self.Owner.Stances[self.World.LocalPlayer] != Stance.Ally) if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
return 0; return 0;
var spm = self.Owner.PlayerActor.Trait<SupportPowerManager>(); var spm = self.Owner.PlayerActor.Trait<SupportPowerManager>();

1
mods/cnc/rules/system.yaml
View File

@@ -229,6 +229,7 @@ World:
Name: effect Name: effect
Filename: temperat.pal Filename: temperat.pal
ShadowIndex: 4 ShadowIndex: 4
AllowModifiers: false
PaletteFromFile@colorpicker: PaletteFromFile@colorpicker:
Name: colorpicker Name: colorpicker
Filename: temperat.pal Filename: temperat.pal