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

Merge pull request #12572 from GraionDilach/experience-modifiers

Browse Source 
Implement experience multipliers.
This commit is contained in:
RoosterDragon
2017-01-19 20:42:48 +00:00
committed by GitHub
parent 9816052262 1544f24663
commit 867ad0fb32
5 changed files with 89 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
View File

@@ -361,6 +361,8 @@
<Compile Include="Traits\Passenger.cs" />
<Compile Include="Traits\Multipliers\DamageMultiplier.cs" />
<Compile Include="Traits\Multipliers\FirepowerMultiplier.cs" />
<Compile Include="Traits\Multipliers\GainsExperienceMultiplier.cs" />
<Compile Include="Traits\Multipliers\GivesExperienceMultiplier.cs" />
<Compile Include="Traits\Multipliers\InaccuracyMultiplier.cs" />
<Compile Include="Traits\Multipliers\ReloadDelayMultiplier.cs" />
<Compile Include="Traits\Multipliers\SpeedMultiplier.cs" />

10
OpenRA.Mods.Common/Traits/GivesExperience.cs
View File

@@ -9,6 +9,7 @@
*/
#endregion
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
@@ -54,9 +55,16 @@ namespace OpenRA.Mods.Common.Traits
? info.Experience
: valued != null ? valued.Cost : 0;
var experienceModifier = self.TraitsImplementing<IGivesExperienceModifier>().Select(x => x.GetGivesExperienceModifier());
Util.ApplyPercentageModifiers(exp, experienceModifier);
var killer = e.Attacker.TraitOrDefault<GainsExperience>();
if (killer != null)
killer.GiveExperience(Util.ApplyPercentageModifiers(exp, new[] { info.ActorExperienceModifier }));
{
var killerExperienceModifier = e.Attacker.TraitsImplementing<IGainsExperienceModifier>()
.Select(x => x.GetGainsExperienceModifier()).Append(info.ActorExperienceModifier);
killer.GiveExperience(Util.ApplyPercentageModifiers(exp, killerExperienceModifier));
}
var attackerExp = e.Attacker.Owner.PlayerActor.TraitOrDefault<PlayerExperience>();
if (attackerExp != null)

36
OpenRA.Mods.Common/Traits/Multipliers/GainsExperienceMultiplier.cs Normal file
View File

@@ -0,0 +1,36 @@
#region Copyright & License Information
/*
* Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation, either version 3 of
* the License, or (at your option) any later version. For more
* information, see COPYING.
*/
#endregion
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("Modifies the experience gathered by this actor.")]
public class GainsExperienceMultiplierInfo : ConditionalTraitInfo
{
[FieldLoader.Require]
[Desc("Percentage modifier to apply.")]
public readonly int Modifier = 100;
public override object Create(ActorInitializer init) { return new GainsExperienceMultiplier(this); }
}
public class GainsExperienceMultiplier : ConditionalTrait<GainsExperienceMultiplierInfo>, IGainsExperienceModifier
{
public GainsExperienceMultiplier(GainsExperienceMultiplierInfo info)
: base(info) { }
int IGainsExperienceModifier.GetGainsExperienceModifier()
{
return IsTraitDisabled ? 100 : Info.Modifier;
}
}
}

36
OpenRA.Mods.Common/Traits/Multipliers/GivesExperienceMultiplier.cs Normal file
View File

@@ -0,0 +1,36 @@
#region Copyright & License Information
/*
* Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation, either version 3 of
* the License, or (at your option) any later version. For more
* information, see COPYING.
*/
#endregion
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("Modifies the experience given by this actor.")]
public class GivesExperienceMultiplierInfo : ConditionalTraitInfo
{
[FieldLoader.Require]
[Desc("Percentage modifier to apply.")]
public readonly int Modifier = 100;
public override object Create(ActorInitializer init) { return new GivesExperienceMultiplier(this); }
}
public class GivesExperienceMultiplier : ConditionalTrait<GivesExperienceMultiplierInfo>, IGivesExperienceModifier
{
public GivesExperienceMultiplier(GivesExperienceMultiplierInfo info)
: base(info) { }
int IGivesExperienceModifier.GetGivesExperienceModifier()
{
return IsTraitDisabled ? 100 : Info.Modifier;
}
}
}

6
OpenRA.Mods.Common/TraitsInterfaces.cs
View File

@@ -227,4 +227,10 @@ namespace OpenRA.Mods.Common.Traits
[RequireExplicitImplementation]
public interface IPowerModifier { int GetPowerModifier(); }
[RequireExplicitImplementation]
public interface IGivesExperienceModifier { int GetGivesExperienceModifier(); }
[RequireExplicitImplementation]
public interface IGainsExperienceModifier { int GetGainsExperienceModifier(); }
}