Proper skill values and proper FocusMomentum.
Contributed by nasseka.
This commit is contained in:
parent
53bb6c78bb
commit
004a35a793
@ -58,7 +58,7 @@ public class FocusMomentum extends AbstractEffect
|
|||||||
|
|
||||||
final PlayerInstance player = effected.getActingPlayer();
|
final PlayerInstance player = effected.getActingPlayer();
|
||||||
final int currentCharges = player.getCharges();
|
final int currentCharges = player.getCharges();
|
||||||
final int maxCharges = Math.min(_maxCharges, (int) effected.getStat().getValue(Stat.MAX_MOMENTUM, 1));
|
final int maxCharges = Math.min(_maxCharges, (int) effected.getStat().getValue(Stat.MAX_MOMENTUM));
|
||||||
|
|
||||||
if (currentCharges >= maxCharges)
|
if (currentCharges >= maxCharges)
|
||||||
{
|
{
|
||||||
|
@ -58,7 +58,7 @@ public class FocusMomentum extends AbstractEffect
|
|||||||
|
|
||||||
final PlayerInstance player = effected.getActingPlayer();
|
final PlayerInstance player = effected.getActingPlayer();
|
||||||
final int currentCharges = player.getCharges();
|
final int currentCharges = player.getCharges();
|
||||||
final int maxCharges = Math.min(_maxCharges, (int) effected.getStat().getValue(Stat.MAX_MOMENTUM, 1));
|
final int maxCharges = Math.min(_maxCharges, (int) effected.getStat().getValue(Stat.MAX_MOMENTUM));
|
||||||
|
|
||||||
if (currentCharges >= maxCharges)
|
if (currentCharges >= maxCharges)
|
||||||
{
|
{
|
||||||
|
@ -58,7 +58,7 @@ public class FocusMomentum extends AbstractEffect
|
|||||||
|
|
||||||
final PlayerInstance player = effected.getActingPlayer();
|
final PlayerInstance player = effected.getActingPlayer();
|
||||||
final int currentCharges = player.getCharges();
|
final int currentCharges = player.getCharges();
|
||||||
final int maxCharges = Math.min(_maxCharges, (int) effected.getStat().getValue(Stat.MAX_MOMENTUM, 1));
|
final int maxCharges = Math.min(_maxCharges, (int) effected.getStat().getValue(Stat.MAX_MOMENTUM));
|
||||||
|
|
||||||
if (currentCharges >= maxCharges)
|
if (currentCharges >= maxCharges)
|
||||||
{
|
{
|
||||||
|
@ -95,8 +95,10 @@
|
|||||||
<operateType>P</operateType>
|
<operateType>P</operateType>
|
||||||
<effects>
|
<effects>
|
||||||
<effect name="FocusEnergy">
|
<effect name="FocusEnergy">
|
||||||
<amount level="1">5</amount>
|
<amount>
|
||||||
<amount level="2">10</amount>
|
<value level="1">5</value>
|
||||||
|
<value level="2">10</value>
|
||||||
|
</amount>
|
||||||
</effect>
|
</effect>
|
||||||
</effects>
|
</effects>
|
||||||
</skill>
|
</skill>
|
||||||
|
@ -58,7 +58,7 @@ public class FocusMomentum extends AbstractEffect
|
|||||||
|
|
||||||
final PlayerInstance player = effected.getActingPlayer();
|
final PlayerInstance player = effected.getActingPlayer();
|
||||||
final int currentCharges = player.getCharges();
|
final int currentCharges = player.getCharges();
|
||||||
final int maxCharges = Math.min(_maxCharges, (int) effected.getStat().getValue(Stat.MAX_MOMENTUM, 1));
|
final int maxCharges = Math.min(_maxCharges, (int) effected.getStat().getValue(Stat.MAX_MOMENTUM));
|
||||||
|
|
||||||
if (currentCharges >= maxCharges)
|
if (currentCharges >= maxCharges)
|
||||||
{
|
{
|
||||||
|
@ -92,8 +92,10 @@
|
|||||||
<operateType>P</operateType>
|
<operateType>P</operateType>
|
||||||
<effects>
|
<effects>
|
||||||
<effect name="FocusEnergy">
|
<effect name="FocusEnergy">
|
||||||
<amount level="1">5</amount>
|
<amount>
|
||||||
<amount level="2">10</amount>
|
<value level="1">5</value>
|
||||||
|
<value level="2">10</value>
|
||||||
|
</amount>
|
||||||
</effect>
|
</effect>
|
||||||
</effects>
|
</effects>
|
||||||
</skill>
|
</skill>
|
||||||
|
@ -58,7 +58,7 @@ public class FocusMomentum extends AbstractEffect
|
|||||||
|
|
||||||
final PlayerInstance player = effected.getActingPlayer();
|
final PlayerInstance player = effected.getActingPlayer();
|
||||||
final int currentCharges = player.getCharges();
|
final int currentCharges = player.getCharges();
|
||||||
final int maxCharges = Math.min(_maxCharges, (int) effected.getStat().getValue(Stat.MAX_MOMENTUM, 1));
|
final int maxCharges = Math.min(_maxCharges, (int) effected.getStat().getValue(Stat.MAX_MOMENTUM));
|
||||||
|
|
||||||
if (currentCharges >= maxCharges)
|
if (currentCharges >= maxCharges)
|
||||||
{
|
{
|
||||||
|
@ -92,8 +92,10 @@
|
|||||||
<operateType>P</operateType>
|
<operateType>P</operateType>
|
||||||
<effects>
|
<effects>
|
||||||
<effect name="FocusEnergy">
|
<effect name="FocusEnergy">
|
||||||
<amount level="1">5</amount>
|
<amount>
|
||||||
<amount level="2">10</amount>
|
<value level="1">5</value>
|
||||||
|
<value level="2">10</value>
|
||||||
|
</amount>
|
||||||
</effect>
|
</effect>
|
||||||
</effects>
|
</effects>
|
||||||
</skill>
|
</skill>
|
||||||
|
@ -58,7 +58,7 @@ public class FocusMomentum extends AbstractEffect
|
|||||||
|
|
||||||
final PlayerInstance player = effected.getActingPlayer();
|
final PlayerInstance player = effected.getActingPlayer();
|
||||||
final int currentCharges = player.getCharges();
|
final int currentCharges = player.getCharges();
|
||||||
final int maxCharges = Math.min(_maxCharges, (int) effected.getStat().getValue(Stat.MAX_MOMENTUM, 1));
|
final int maxCharges = Math.min(_maxCharges, (int) effected.getStat().getValue(Stat.MAX_MOMENTUM));
|
||||||
|
|
||||||
if (currentCharges >= maxCharges)
|
if (currentCharges >= maxCharges)
|
||||||
{
|
{
|
||||||
|
@ -92,8 +92,10 @@
|
|||||||
<operateType>P</operateType>
|
<operateType>P</operateType>
|
||||||
<effects>
|
<effects>
|
||||||
<effect name="FocusEnergy">
|
<effect name="FocusEnergy">
|
||||||
<amount level="1">5</amount>
|
<amount>
|
||||||
<amount level="2">10</amount>
|
<value level="1">5</value>
|
||||||
|
<value level="2">10</value>
|
||||||
|
</amount>
|
||||||
</effect>
|
</effect>
|
||||||
</effects>
|
</effects>
|
||||||
</skill>
|
</skill>
|
||||||
|
@ -58,7 +58,7 @@ public class FocusMomentum extends AbstractEffect
|
|||||||
|
|
||||||
final PlayerInstance player = effected.getActingPlayer();
|
final PlayerInstance player = effected.getActingPlayer();
|
||||||
final int currentCharges = player.getCharges();
|
final int currentCharges = player.getCharges();
|
||||||
final int maxCharges = Math.min(_maxCharges, (int) effected.getStat().getValue(Stat.MAX_MOMENTUM, 1));
|
final int maxCharges = Math.min(_maxCharges, (int) effected.getStat().getValue(Stat.MAX_MOMENTUM));
|
||||||
|
|
||||||
if (currentCharges >= maxCharges)
|
if (currentCharges >= maxCharges)
|
||||||
{
|
{
|
||||||
|
@ -100,8 +100,10 @@
|
|||||||
<operateType>P</operateType>
|
<operateType>P</operateType>
|
||||||
<effects>
|
<effects>
|
||||||
<effect name="FocusEnergy">
|
<effect name="FocusEnergy">
|
||||||
<amount level="1">5</amount>
|
<amount>
|
||||||
<amount level="2">10</amount>
|
<value level="1">5</value>
|
||||||
|
<value level="2">10</value>
|
||||||
|
</amount>
|
||||||
</effect>
|
</effect>
|
||||||
</effects>
|
</effects>
|
||||||
</skill>
|
</skill>
|
||||||
|
@ -58,7 +58,7 @@ public class FocusMomentum extends AbstractEffect
|
|||||||
|
|
||||||
final PlayerInstance player = effected.getActingPlayer();
|
final PlayerInstance player = effected.getActingPlayer();
|
||||||
final int currentCharges = player.getCharges();
|
final int currentCharges = player.getCharges();
|
||||||
final int maxCharges = Math.min(_maxCharges, (int) effected.getStat().getValue(Stat.MAX_MOMENTUM, 1));
|
final int maxCharges = Math.min(_maxCharges, (int) effected.getStat().getValue(Stat.MAX_MOMENTUM));
|
||||||
|
|
||||||
if (currentCharges >= maxCharges)
|
if (currentCharges >= maxCharges)
|
||||||
{
|
{
|
||||||
|
@ -100,8 +100,10 @@
|
|||||||
<operateType>P</operateType>
|
<operateType>P</operateType>
|
||||||
<effects>
|
<effects>
|
||||||
<effect name="FocusEnergy">
|
<effect name="FocusEnergy">
|
||||||
<amount level="1">5</amount>
|
<amount>
|
||||||
<amount level="2">10</amount>
|
<value level="1">5</value>
|
||||||
|
<value level="2">10</value>
|
||||||
|
</amount>
|
||||||
</effect>
|
</effect>
|
||||||
</effects>
|
</effects>
|
||||||
</skill>
|
</skill>
|
||||||
|
@ -58,7 +58,7 @@ public class FocusMomentum extends AbstractEffect
|
|||||||
|
|
||||||
final PlayerInstance player = effected.getActingPlayer();
|
final PlayerInstance player = effected.getActingPlayer();
|
||||||
final int currentCharges = player.getCharges();
|
final int currentCharges = player.getCharges();
|
||||||
final int maxCharges = Math.min(_maxCharges, (int) effected.getStat().getValue(Stat.MAX_MOMENTUM, 1));
|
final int maxCharges = Math.min(_maxCharges, (int) effected.getStat().getValue(Stat.MAX_MOMENTUM));
|
||||||
|
|
||||||
if (currentCharges >= maxCharges)
|
if (currentCharges >= maxCharges)
|
||||||
{
|
{
|
||||||
|
@ -100,8 +100,10 @@
|
|||||||
<operateType>P</operateType>
|
<operateType>P</operateType>
|
||||||
<effects>
|
<effects>
|
||||||
<effect name="FocusEnergy">
|
<effect name="FocusEnergy">
|
||||||
<amount level="1">5</amount>
|
<amount>
|
||||||
<amount level="2">10</amount>
|
<value level="1">5</value>
|
||||||
|
<value level="2">10</value>
|
||||||
|
</amount>
|
||||||
</effect>
|
</effect>
|
||||||
</effects>
|
</effects>
|
||||||
</skill>
|
</skill>
|
||||||
|
@ -58,7 +58,7 @@ public class FocusMomentum extends AbstractEffect
|
|||||||
|
|
||||||
final PlayerInstance player = effected.getActingPlayer();
|
final PlayerInstance player = effected.getActingPlayer();
|
||||||
final int currentCharges = player.getCharges();
|
final int currentCharges = player.getCharges();
|
||||||
final int maxCharges = Math.min(_maxCharges, (int) effected.getStat().getValue(Stat.MAX_MOMENTUM, 1));
|
final int maxCharges = Math.min(_maxCharges, (int) effected.getStat().getValue(Stat.MAX_MOMENTUM));
|
||||||
|
|
||||||
if (currentCharges >= maxCharges)
|
if (currentCharges >= maxCharges)
|
||||||
{
|
{
|
||||||
|
@ -100,8 +100,10 @@
|
|||||||
<operateType>P</operateType>
|
<operateType>P</operateType>
|
||||||
<effects>
|
<effects>
|
||||||
<effect name="FocusEnergy">
|
<effect name="FocusEnergy">
|
||||||
<amount level="1">5</amount>
|
<amount>
|
||||||
<amount level="2">10</amount>
|
<value level="1">5</value>
|
||||||
|
<value level="2">10</value>
|
||||||
|
</amount>
|
||||||
</effect>
|
</effect>
|
||||||
</effects>
|
</effects>
|
||||||
</skill>
|
</skill>
|
||||||
|
@ -58,7 +58,7 @@ public class FocusMomentum extends AbstractEffect
|
|||||||
|
|
||||||
final PlayerInstance player = effected.getActingPlayer();
|
final PlayerInstance player = effected.getActingPlayer();
|
||||||
final int currentCharges = player.getCharges();
|
final int currentCharges = player.getCharges();
|
||||||
final int maxCharges = Math.min(_maxCharges, (int) effected.getStat().getValue(Stat.MAX_MOMENTUM, 1));
|
final int maxCharges = Math.min(_maxCharges, (int) effected.getStat().getValue(Stat.MAX_MOMENTUM));
|
||||||
|
|
||||||
if (currentCharges >= maxCharges)
|
if (currentCharges >= maxCharges)
|
||||||
{
|
{
|
||||||
|
@ -100,8 +100,10 @@
|
|||||||
<operateType>P</operateType>
|
<operateType>P</operateType>
|
||||||
<effects>
|
<effects>
|
||||||
<effect name="FocusEnergy">
|
<effect name="FocusEnergy">
|
||||||
<amount level="1">5</amount>
|
<amount>
|
||||||
<amount level="2">10</amount>
|
<value level="1">5</value>
|
||||||
|
<value level="2">10</value>
|
||||||
|
</amount>
|
||||||
</effect>
|
</effect>
|
||||||
</effects>
|
</effects>
|
||||||
</skill>
|
</skill>
|
||||||
|
@ -92,8 +92,10 @@
|
|||||||
<operateType>P</operateType>
|
<operateType>P</operateType>
|
||||||
<effects>
|
<effects>
|
||||||
<effect name="FocusEnergy">
|
<effect name="FocusEnergy">
|
||||||
<amount level="1">5</amount>
|
<amount>
|
||||||
<amount level="2">10</amount>
|
<value level="1">5</value>
|
||||||
|
<value level="2">10</value>
|
||||||
|
</amount>
|
||||||
</effect>
|
</effect>
|
||||||
</effects>
|
</effects>
|
||||||
</skill>
|
</skill>
|
||||||
|
Loading…
Reference in New Issue
Block a user