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

fix tk detection; fix crash on lacking ValuedInfo; fix traits being fetched twice; fix needless mutation of 'exp'

Browse Source
This commit is contained in:
Chris Forbes
2010-05-27 18:31:42 +12:00
parent a070820695
commit 0c8e8b5658
2 changed files with 84 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,11 +18,12 @@
*/ */
#endregion #endregion
using OpenRA.GameRules;
using OpenRA.Traits;
using System.Linq;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using OpenRA.GameRules;
using OpenRA.Mods.RA.Effects; using OpenRA.Mods.RA.Effects;
using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA
{ {
public class GainsExperienceInfo : ITraitInfo public class GainsExperienceInfo : ITraitInfo
@@ -44,7 +45,6 @@ namespace OpenRA.Mods.RA
{ {
this.self = self; this.self = self;
this.Info = info; this.Info = info;
System.Console.WriteLine(self.Info.Name);
var cost = self.Info.Traits.Get<ValuedInfo>().Cost; var cost = self.Info.Traits.Get<ValuedInfo>().Cost;
Levels = Info.CostThreshold.Select(t => t * cost).ToList(); Levels = Info.CostThreshold.Select(t => t * cost).ToList();
} }
@@ -56,18 +56,14 @@ namespace OpenRA.Mods.RA
public void GiveExperience(int amount) public void GiveExperience(int amount)
{ {
// Already at max level
if (Level == Levels.Count() - 1)
return;
Experience += amount; Experience += amount;
if (Experience > Levels[Level]) while (Level < Levels.Count() - 1 && Experience > Levels[Level])
{ {
Level++; Level++;
// TODO: Show an effect or play a sound or something // TODO: Show an effect or play a sound or something
System.Console.WriteLine("{0} became Level {1}",self.Info.Name, Level); Log.Write("{0} became Level {1}".F(self.Info.Name, Level));
self.World.AddFrameEndTask(w => self.World.AddFrameEndTask(w =>
{ {
@@ -78,24 +74,17 @@ namespace OpenRA.Mods.RA
public float GetDamageModifier(WarheadInfo warhead) public float GetDamageModifier(WarheadInfo warhead)
{ {
if (Level == 0) return Level > 0 ? 1 / Info.ArmorModifier[Level - 1] : 1;
return 1.0f;
return 1/Info.ArmorModifier[Level - 1];
} }
public float GetFirepowerModifier() public float GetFirepowerModifier()
{ {
if (Level == 0) return Level > 0 ? Info.FirepowerModifier[Level - 1] : 1;
return 1.0f;
return Info.FirepowerModifier[Level - 1] ;
} }
public float GetSpeedModifier() public float GetSpeedModifier()
{ {
if (Level == 0) return Level > 0 ? Info.SpeedModifier[Level - 1] : 1;
return 1.0f;
return Info.SpeedModifier[Level - 1] ;
} }
} }
} }

16
OpenRA.Mods.RA/GivesExperience.cs
View File

@@ -19,7 +19,6 @@
#endregion #endregion
using OpenRA.Traits; using OpenRA.Traits;
using System.Linq;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA
{ {
@@ -32,16 +31,17 @@ namespace OpenRA.Mods.RA
if (e.DamageState == DamageState.Dead) if (e.DamageState == DamageState.Dead)
{ {
// Prevent TK from giving exp // Prevent TK from giving exp
//if (self.Owner == e.Attacker.Owner) //if (e.Attacker == null || e.Attacker.Owner.Stances[ self.Owner ] == Stance.Ally )
// return; // return;
var exp = 0; var info = self.Info.Traits.Get<GivesExperienceInfo>();
if (self.Info.Traits.Get<ValuedInfo>() != null) var valued = self.Info.Traits.GetOrDefault<ValuedInfo>();
exp = self.Info.Traits.Get<ValuedInfo>().Cost;
if (self.Info.Traits.Get<GivesExperienceInfo>().Experience >= 0)
exp = self.Info.Traits.Get<GivesExperienceInfo>().Experience;
var killer = e.Attacker.traits.WithInterface<GainsExperience>().FirstOrDefault(); var exp = info.Experience >= 0
? info.Experience
: valued != null ? valued.Cost : 0;
var killer = e.Attacker.traits.GetOrDefault<GainsExperience>();
if (killer != null) if (killer != null)
killer.GiveExperience(exp); killer.GiveExperience(exp);
} }