Adjustments for skills that use charges.

Contributed by Trance.

L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java

@@ -49,8 +49,7 @@ public class FocusMaxMomentum extends AbstractEffect
 		if (effected.isPlayer())
 		{
 			final PlayerInstance player = effected.getActingPlayer();
-			
+			final int count = (int) effected.getStat().getValue(Stat.MAX_MOMENTUM, 0);
-			final int count = (int) effected.getStat().getValue(Stat.MAX_MOMENTUM, 1);
 			
 			player.setCharges(count);
 			

L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java

@@ -58,7 +58,7 @@ public class FocusMomentum extends AbstractEffect
 		
 		final PlayerInstance player = effected.getActingPlayer();
 		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, 8));
 		
 		if (currentCharges >= maxCharges)
 		{
@@ -70,7 +70,6 @@ public class FocusMomentum extends AbstractEffect
 		}
 		
 		final int newCharge = Math.min(currentCharges + _amount, maxCharges);
-		
 		player.setCharges(newCharge);
 		
 		if (newCharge == maxCharges)

L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java

@@ -51,7 +51,7 @@ public class GetMomentum extends AbstractEffect
 		if (effected.isPlayer())
 		{
 			final PlayerInstance player = effected.getActingPlayer();
-			final int maxCharge = (int) player.getStat().getValue(Stat.MAX_MOMENTUM, 1);
+			final int maxCharge = (int) player.getStat().getValue(Stat.MAX_MOMENTUM, 0);
 			final int newCharge = Math.min(player.getCharges() + 1, maxCharge);
 			
 			player.setCharges(newCharge);

L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/00000-00099.xml

@@ -488,6 +488,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<chargeConsume>3</chargeConsume>
 		<conditions>
 			<condition name="EquipWeapon">
 				<weaponType>
@@ -495,10 +496,12 @@
 					<item>DUALBLUNT</item>
 				</weaponType>
 			</condition>
+			<condition name="EnergySaved">
+				<amount>3</amount>
+			</condition>
 		</conditions>
 		<effects>
 			<effect name="EnergyAttack">
-				<chargeConsume>3</chargeConsume>
 				<criticalChance>15</criticalChance>
 				<power>
 					<value level="1">918</value>
@@ -665,6 +668,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<chargeConsume>2</chargeConsume>
 		<conditions>
 			<condition name="EquipWeapon">
 				<weaponType>
@@ -674,10 +678,12 @@
 					<item>DUALBLUNT</item>
 				</weaponType>
 			</condition>
+			<condition name="EnergySaved">
+				<amount>2</amount>
+			</condition>
 		</conditions>
 		<effects>
 			<effect name="EnergyAttack">
-				<chargeConsume>2</chargeConsume>
 				<criticalChance>15</criticalChance>
 				<power>
 					<value level="1">369</value>
@@ -4237,6 +4243,9 @@
 					<item>POLE</item>
 				</weaponType>
 			</condition>
+			<condition name="EnergySaved">
+				<amount>1</amount>
+			</condition>
 		</conditions>
 		<effects>
 			<effect name="PhysicalAttack">

L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/00200-00299.xml

@@ -4124,6 +4124,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<chargeConsume>4</chargeConsume>
 		<conditions>
 			<condition name="EquipWeapon">
 				<weaponType>
@@ -4131,10 +4132,12 @@
 					<item>DUALBLUNT</item>
 				</weaponType>
 			</condition>
+			<condition name="EnergySaved">
+				<amount>4</amount>
+			</condition>
 		</conditions>
 		<effects>
 			<effect name="EnergyAttack">
-				<chargeConsume>4</chargeConsume>
 				<criticalChance>
 					<value fromLevel="1" toLevel="34">15</value>
 					<value fromLevel="30" toLevel="34" fromSubLevel="2001" toSubLevel="2020">{base + base / 100 * subIndex}</value>
@@ -5546,6 +5549,7 @@
 		<trait>SHOCK</trait>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<chargeConsume>2</chargeConsume>
 		<conditions>
 			<condition name="EquipWeapon">
 				<weaponType>
@@ -5864,10 +5868,12 @@
 					<item>DUALFIST</item>
 				</weaponType>
 			</condition>
+			<condition name="EnergySaved">
+				<amount>2</amount>
+			</condition>
 		</conditions>
 		<effects>
 			<effect name="EnergyAttack">
-				<chargeConsume>2</chargeConsume>
 				<criticalChance>15</criticalChance>
 				<overHit>true</overHit>
 				<power>

L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/00500-00599.xml

@@ -3529,6 +3529,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<chargeConsume>2</chargeConsume>
 		<conditions>
 			<condition name="EnergySaved">
 				<amount>2</amount>
@@ -3536,7 +3537,6 @@
 		</conditions>
 		<effects>
 			<effect name="EnergyAttack">
-				<chargeConsume>2</chargeConsume>
 				<criticalChance>10</criticalChance>
 				<power>
 					<value level="1">1250</value>
@@ -3579,6 +3579,7 @@
 		<targetType>ENEMY</targetType>
 		<affectScope>RANGE</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
+		<chargeConsume>3</chargeConsume>
 		<conditions>
 			<condition name="EnergySaved">
 				<amount>3</amount>
@@ -3586,7 +3587,6 @@
 		</conditions>
 		<effects>
 			<effect name="EnergyAttack">
-				<chargeConsume>3</chargeConsume>
 				<criticalChance>10</criticalChance>
 				<power>
 					<value level="1">625</value>

L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/00700-00799.xml

@@ -2914,6 +2914,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<chargeConsume>2</chargeConsume>
 		<conditions>
 			<condition name="EquipWeapon">
 				<weaponType>
@@ -2926,7 +2927,6 @@
 		</conditions>
 		<effects>
 			<effect name="EnergyAttack">
-				<chargeConsume>2</chargeConsume>
 				<criticalChance>20</criticalChance>
 				<power>4500</power>
 				<overHit>true</overHit>

L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10200-10299.xml

@@ -797,6 +797,7 @@
 		</effectPoint>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<chargeConsume>3</chargeConsume>
 		<conditions>
 			<condition name="EquipWeapon">
 				<weaponType>
@@ -808,6 +809,9 @@
 					<item>DUALBLUNT</item>
 				</weaponType>
 			</condition>
+			<condition name="EnergySaved">
+				<amount>3</amount>
+			</condition>
 		</conditions>
 		<effects>
 			<effect name="EnergyAttack">
@@ -826,7 +830,6 @@
 					<value fromLevel="7" toLevel="11" fromSubLevel="1001" toSubLevel="1020">{base + base / 100 * subIndex}</value>
 				</power>
 				<ignoreShieldDefence>true</ignoreShieldDefence>
-				<chargeConsume>3</chargeConsume>
 				<criticalChance>
 					<value fromLevel="1" toLevel="11">3</value>
 					<value fromLevel="7" toLevel="11" fromSubLevel="2001" toSubLevel="2020">{base + base / 100 * subIndex}</value>
@@ -895,6 +898,7 @@
 		<trait>KNOCKDOWN</trait>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<chargeConsume>3</chargeConsume>
 		<conditions>
 			<condition name="EquipWeapon">
 				<weaponType>
@@ -906,6 +910,9 @@
 					<item>DUALBLUNT</item>
 				</weaponType>
 			</condition>
+			<condition name="EnergySaved">
+				<amount>3</amount>
+			</condition>
 		</conditions>
 		<effects>
 			<effect name="EnergyAttack">
@@ -922,7 +929,6 @@
 					<value fromLevel="5" toLevel="9" fromSubLevel="1001" toSubLevel="1020">{base + base / 100 * subIndex}</value>
 				</power>
 				<ignoreShieldDefence>true</ignoreShieldDefence>
-				<chargeConsume>3</chargeConsume>
 				<criticalChance>3</criticalChance>
 				<overHit>true</overHit>
 			</effect>
@@ -1452,6 +1458,7 @@
 		<targetType>ENEMY</targetType>
 		<affectScope>RANGE</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
+		<chargeConsume>3</chargeConsume>
 		<conditions>
 			<condition name="EquipWeapon">
 				<weaponType>
@@ -1469,6 +1476,9 @@
 					<value fromLevel="6" toLevel="10" fromSubLevel="3001" toSubLevel="3020">{base - (3 * subIndex)}</value>
 				</distance>
 			</condition>
+			<condition name="EnergySaved">
+				<amount>3</amount>
+			</condition>
 		</conditions>
 		<effects>
 			<effect name="EnergyAttack">
@@ -1486,7 +1496,6 @@
 				</power>
 				<overHit>true</overHit>
 				<criticalChance>3</criticalChance>
-				<chargeConsume>3</chargeConsume>
 			</effect>
 			<effect name="Speed">
 				<amount>-180</amount>

L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10300-10399.xml

@@ -774,6 +774,7 @@
 			<value level="7">-213</value>
 		</effectPoint>
 		<reuseDelay>10000</reuseDelay>
+		<chargeConsume>3</chargeConsume>
 		<conditions>
 			<condition name="EquipWeapon">
 				<weaponType>
@@ -782,6 +783,9 @@
 					<item>DUAL</item>
 				</weaponType>
 			</condition>
+			<condition name="EnergySaved">
+				<amount>3</amount>
+			</condition>
 		</conditions>
 		<effects>
 			<effect name="EnergyAttack">
@@ -804,7 +808,6 @@
 					<value fromLevel="1" toLevel="7">1</value>
 					<value fromLevel="3" toLevel="7" fromSubLevel="3001" toSubLevel="3020">{0.99 - 0.006 * (subIndex - 1)}</value>
 				</pDefMod>
-				<chargeConsume>3</chargeConsume>
 			</effect>
 		</effects>
 	</skill>