ShotsBonusFinalizer simplification.
This commit is contained in:
@@ -35,7 +35,6 @@ public class ShotsBonusFinalizer implements IStatsFunction
|
|||||||
throwIfPresent(base);
|
throwIfPresent(base);
|
||||||
|
|
||||||
double baseValue = 1;
|
double baseValue = 1;
|
||||||
double rubyBonus = 0;
|
|
||||||
final PlayerInstance player = creature.getActingPlayer();
|
final PlayerInstance player = creature.getActingPlayer();
|
||||||
if (player != null)
|
if (player != null)
|
||||||
{
|
{
|
||||||
@@ -46,9 +45,9 @@ public class ShotsBonusFinalizer implements IStatsFunction
|
|||||||
}
|
}
|
||||||
if (player.getActiveRubyJewel() != null)
|
if (player.getActiveRubyJewel() != null)
|
||||||
{
|
{
|
||||||
rubyBonus = player.getActiveRubyJewel().getBonus();
|
baseValue += player.getActiveRubyJewel().getBonus();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return Stats.defaultValue(creature, stat, baseValue + rubyBonus);
|
return Stats.defaultValue(creature, stat, baseValue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -35,7 +35,6 @@ public class ShotsBonusFinalizer implements IStatsFunction
|
|||||||
throwIfPresent(base);
|
throwIfPresent(base);
|
||||||
|
|
||||||
double baseValue = 1;
|
double baseValue = 1;
|
||||||
double rubyBonus = 0;
|
|
||||||
final PlayerInstance player = creature.getActingPlayer();
|
final PlayerInstance player = creature.getActingPlayer();
|
||||||
if (player != null)
|
if (player != null)
|
||||||
{
|
{
|
||||||
@@ -46,9 +45,9 @@ public class ShotsBonusFinalizer implements IStatsFunction
|
|||||||
}
|
}
|
||||||
if (player.getActiveRubyJewel() != null)
|
if (player.getActiveRubyJewel() != null)
|
||||||
{
|
{
|
||||||
rubyBonus = player.getActiveRubyJewel().getBonus();
|
baseValue += player.getActiveRubyJewel().getBonus();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return Stats.defaultValue(creature, stat, baseValue + rubyBonus);
|
return Stats.defaultValue(creature, stat, baseValue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -35,7 +35,6 @@ public class ShotsBonusFinalizer implements IStatsFunction
|
|||||||
throwIfPresent(base);
|
throwIfPresent(base);
|
||||||
|
|
||||||
double baseValue = 1;
|
double baseValue = 1;
|
||||||
double rubyBonus = 0;
|
|
||||||
final PlayerInstance player = creature.getActingPlayer();
|
final PlayerInstance player = creature.getActingPlayer();
|
||||||
if (player != null)
|
if (player != null)
|
||||||
{
|
{
|
||||||
@@ -46,9 +45,9 @@ public class ShotsBonusFinalizer implements IStatsFunction
|
|||||||
}
|
}
|
||||||
if (player.getActiveRubyJewel() != null)
|
if (player.getActiveRubyJewel() != null)
|
||||||
{
|
{
|
||||||
rubyBonus = player.getActiveRubyJewel().getBonus();
|
baseValue += player.getActiveRubyJewel().getBonus();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return Stats.defaultValue(creature, stat, baseValue + rubyBonus);
|
return Stats.defaultValue(creature, stat, baseValue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -35,7 +35,6 @@ public class ShotsBonusFinalizer implements IStatsFunction
|
|||||||
throwIfPresent(base);
|
throwIfPresent(base);
|
||||||
|
|
||||||
double baseValue = 1;
|
double baseValue = 1;
|
||||||
double rubyBonus = 0;
|
|
||||||
final PlayerInstance player = creature.getActingPlayer();
|
final PlayerInstance player = creature.getActingPlayer();
|
||||||
if (player != null)
|
if (player != null)
|
||||||
{
|
{
|
||||||
@@ -46,9 +45,9 @@ public class ShotsBonusFinalizer implements IStatsFunction
|
|||||||
}
|
}
|
||||||
if (player.getActiveRubyJewel() != null)
|
if (player.getActiveRubyJewel() != null)
|
||||||
{
|
{
|
||||||
rubyBonus = player.getActiveRubyJewel().getBonus();
|
baseValue += player.getActiveRubyJewel().getBonus();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return Stats.defaultValue(creature, stat, baseValue + rubyBonus);
|
return Stats.defaultValue(creature, stat, baseValue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -35,7 +35,6 @@ public class ShotsBonusFinalizer implements IStatsFunction
|
|||||||
throwIfPresent(base);
|
throwIfPresent(base);
|
||||||
|
|
||||||
double baseValue = 1;
|
double baseValue = 1;
|
||||||
double rubyBonus = 0;
|
|
||||||
final PlayerInstance player = creature.getActingPlayer();
|
final PlayerInstance player = creature.getActingPlayer();
|
||||||
if (player != null)
|
if (player != null)
|
||||||
{
|
{
|
||||||
@@ -46,9 +45,9 @@ public class ShotsBonusFinalizer implements IStatsFunction
|
|||||||
}
|
}
|
||||||
if (player.getActiveRubyJewel() != null)
|
if (player.getActiveRubyJewel() != null)
|
||||||
{
|
{
|
||||||
rubyBonus = player.getActiveRubyJewel().getBonus();
|
baseValue += player.getActiveRubyJewel().getBonus();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return Stats.defaultValue(creature, stat, baseValue + rubyBonus);
|
return Stats.defaultValue(creature, stat, baseValue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -35,7 +35,6 @@ public class ShotsBonusFinalizer implements IStatsFunction
|
|||||||
throwIfPresent(base);
|
throwIfPresent(base);
|
||||||
|
|
||||||
double baseValue = 1;
|
double baseValue = 1;
|
||||||
double rubyBonus = 0;
|
|
||||||
final PlayerInstance player = creature.getActingPlayer();
|
final PlayerInstance player = creature.getActingPlayer();
|
||||||
if (player != null)
|
if (player != null)
|
||||||
{
|
{
|
||||||
@@ -46,9 +45,9 @@ public class ShotsBonusFinalizer implements IStatsFunction
|
|||||||
}
|
}
|
||||||
if (player.getActiveRubyJewel() != null)
|
if (player.getActiveRubyJewel() != null)
|
||||||
{
|
{
|
||||||
rubyBonus = player.getActiveRubyJewel().getBonus();
|
baseValue += player.getActiveRubyJewel().getBonus();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return Stats.defaultValue(creature, stat, baseValue + rubyBonus);
|
return Stats.defaultValue(creature, stat, baseValue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -35,7 +35,6 @@ public class ShotsBonusFinalizer implements IStatsFunction
|
|||||||
throwIfPresent(base);
|
throwIfPresent(base);
|
||||||
|
|
||||||
double baseValue = 1;
|
double baseValue = 1;
|
||||||
double rubyBonus = 0;
|
|
||||||
final PlayerInstance player = creature.getActingPlayer();
|
final PlayerInstance player = creature.getActingPlayer();
|
||||||
if (player != null)
|
if (player != null)
|
||||||
{
|
{
|
||||||
@@ -46,9 +45,9 @@ public class ShotsBonusFinalizer implements IStatsFunction
|
|||||||
}
|
}
|
||||||
if (player.getActiveRubyJewel() != null)
|
if (player.getActiveRubyJewel() != null)
|
||||||
{
|
{
|
||||||
rubyBonus = player.getActiveRubyJewel().getBonus();
|
baseValue += player.getActiveRubyJewel().getBonus();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return Stats.defaultValue(creature, stat, baseValue + rubyBonus);
|
return Stats.defaultValue(creature, stat, baseValue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -35,7 +35,6 @@ public class ShotsBonusFinalizer implements IStatsFunction
|
|||||||
throwIfPresent(base);
|
throwIfPresent(base);
|
||||||
|
|
||||||
double baseValue = 1;
|
double baseValue = 1;
|
||||||
double rubyBonus = 0;
|
|
||||||
final PlayerInstance player = creature.getActingPlayer();
|
final PlayerInstance player = creature.getActingPlayer();
|
||||||
if (player != null)
|
if (player != null)
|
||||||
{
|
{
|
||||||
@@ -46,9 +45,9 @@ public class ShotsBonusFinalizer implements IStatsFunction
|
|||||||
}
|
}
|
||||||
if (player.getActiveRubyJewel() != null)
|
if (player.getActiveRubyJewel() != null)
|
||||||
{
|
{
|
||||||
rubyBonus = player.getActiveRubyJewel().getBonus();
|
baseValue += player.getActiveRubyJewel().getBonus();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return Stats.defaultValue(creature, stat, baseValue + rubyBonus);
|
return Stats.defaultValue(creature, stat, baseValue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -35,7 +35,6 @@ public class ShotsBonusFinalizer implements IStatsFunction
|
|||||||
throwIfPresent(base);
|
throwIfPresent(base);
|
||||||
|
|
||||||
double baseValue = 1;
|
double baseValue = 1;
|
||||||
double rubyBonus = 0;
|
|
||||||
final PlayerInstance player = creature.getActingPlayer();
|
final PlayerInstance player = creature.getActingPlayer();
|
||||||
if (player != null)
|
if (player != null)
|
||||||
{
|
{
|
||||||
@@ -46,9 +45,9 @@ public class ShotsBonusFinalizer implements IStatsFunction
|
|||||||
}
|
}
|
||||||
if (player.getActiveRubyJewel() != null)
|
if (player.getActiveRubyJewel() != null)
|
||||||
{
|
{
|
||||||
rubyBonus = player.getActiveRubyJewel().getBonus();
|
baseValue += player.getActiveRubyJewel().getBonus();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return Stats.defaultValue(creature, stat, baseValue + rubyBonus);
|
return Stats.defaultValue(creature, stat, baseValue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -35,7 +35,6 @@ public class ShotsBonusFinalizer implements IStatsFunction
|
|||||||
throwIfPresent(base);
|
throwIfPresent(base);
|
||||||
|
|
||||||
double baseValue = 1;
|
double baseValue = 1;
|
||||||
double rubyBonus = 0;
|
|
||||||
final PlayerInstance player = creature.getActingPlayer();
|
final PlayerInstance player = creature.getActingPlayer();
|
||||||
if (player != null)
|
if (player != null)
|
||||||
{
|
{
|
||||||
@@ -46,9 +45,9 @@ public class ShotsBonusFinalizer implements IStatsFunction
|
|||||||
}
|
}
|
||||||
if (player.getActiveRubyJewel() != null)
|
if (player.getActiveRubyJewel() != null)
|
||||||
{
|
{
|
||||||
rubyBonus = player.getActiveRubyJewel().getBonus();
|
baseValue += player.getActiveRubyJewel().getBonus();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return Stats.defaultValue(creature, stat, baseValue + rubyBonus);
|
return Stats.defaultValue(creature, stat, baseValue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -35,7 +35,6 @@ public class ShotsBonusFinalizer implements IStatsFunction
|
|||||||
throwIfPresent(base);
|
throwIfPresent(base);
|
||||||
|
|
||||||
double baseValue = 1;
|
double baseValue = 1;
|
||||||
double rubyBonus = 0;
|
|
||||||
final PlayerInstance player = creature.getActingPlayer();
|
final PlayerInstance player = creature.getActingPlayer();
|
||||||
if (player != null)
|
if (player != null)
|
||||||
{
|
{
|
||||||
@@ -46,9 +45,9 @@ public class ShotsBonusFinalizer implements IStatsFunction
|
|||||||
}
|
}
|
||||||
if (player.getActiveRubyJewel() != null)
|
if (player.getActiveRubyJewel() != null)
|
||||||
{
|
{
|
||||||
rubyBonus = player.getActiveRubyJewel().getBonus();
|
baseValue += player.getActiveRubyJewel().getBonus();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return Stats.defaultValue(creature, stat, baseValue + rubyBonus);
|
return Stats.defaultValue(creature, stat, baseValue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user