lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Addition of chargeConsume skill parameter.

Browse Source
This commit is contained in:
MobiusDev 2018-11-24 00:45:10 +00:00
parent 904a37b895
commit b641e874d4
20 changed files with 190 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/Skill.java
View File

@ -163,6 +163,7 @@ public final class Skill implements IIdentifiable
private final int _minPledgeClass;
private final int _soulMaxConsume;
private final int _chargeConsume;
private final boolean _isTriggeredSkill; // If true the skill will take activation buff slot instead of a normal buff slot
private final int _effectPoint;
@ -380,6 +381,7 @@ public final class Skill implements IIdentifiable
_minPledgeClass = set.getInt("minPledgeClass", 0);
_soulMaxConsume = set.getInt("soulMaxConsumeCount", 0);
_chargeConsume = set.getInt("chargeConsume", 0);
_isTriggeredSkill = set.getBoolean("isTriggeredSkill", false);
_effectPoint = set.getInt("effectPoint", 0);
@ -1063,6 +1065,11 @@ public final class Skill implements IIdentifiable
return _soulMaxConsume;
}
public int getChargeConsumeCount()
{
return _chargeConsume;
}
public boolean isStayAfterDeath()
{
return _stayAfterDeath || _irreplacableBuff || _isNecessaryToggle;

15
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -484,10 +484,19 @@ public class SkillCaster implements Runnable
caster.sendPacket(su);
}
// Consume Souls if necessary
if (caster.isPlayer() && (_skill.getMaxSoulConsumeCount() > 0) && !caster.getActingPlayer().decreaseSouls(_skill.getMaxSoulConsumeCount(), _skill))
if (caster.isPlayer())
{
return false;
// Consume Souls if necessary.
if ((_skill.getMaxSoulConsumeCount() > 0) && !caster.getActingPlayer().decreaseSouls(_skill.getMaxSoulConsumeCount(), _skill))
{
return false;
}
// Consume charges if necessary.
if ((_skill.getChargeConsumeCount() > 0) && !caster.getActingPlayer().decreaseCharges(_skill.getChargeConsumeCount()))
{
return false;
}
}
// Consume skill reduced item on success.

7
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/Skill.java
View File

@ -163,6 +163,7 @@ public final class Skill implements IIdentifiable
private final int _minPledgeClass;
private final int _soulMaxConsume;
private final int _chargeConsume;
private final boolean _isTriggeredSkill; // If true the skill will take activation buff slot instead of a normal buff slot
private final int _effectPoint;
@ -380,6 +381,7 @@ public final class Skill implements IIdentifiable
_minPledgeClass = set.getInt("minPledgeClass", 0);
_soulMaxConsume = set.getInt("soulMaxConsumeCount", 0);
_chargeConsume = set.getInt("chargeConsume", 0);
_isTriggeredSkill = set.getBoolean("isTriggeredSkill", false);
_effectPoint = set.getInt("effectPoint", 0);
@ -1063,6 +1065,11 @@ public final class Skill implements IIdentifiable
return _soulMaxConsume;
}
public int getChargeConsumeCount()
{
return _chargeConsume;
}
public boolean isStayAfterDeath()
{
return _stayAfterDeath || _irreplacableBuff || _isNecessaryToggle;

15
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -484,10 +484,19 @@ public class SkillCaster implements Runnable
caster.sendPacket(su);
}
// Consume Souls if necessary
if (caster.isPlayer() && (_skill.getMaxSoulConsumeCount() > 0) && !caster.getActingPlayer().decreaseSouls(_skill.getMaxSoulConsumeCount(), _skill))
if (caster.isPlayer())
{
return false;
// Consume Souls if necessary.
if ((_skill.getMaxSoulConsumeCount() > 0) && !caster.getActingPlayer().decreaseSouls(_skill.getMaxSoulConsumeCount(), _skill))
{
return false;
}
// Consume charges if necessary.
if ((_skill.getChargeConsumeCount() > 0) && !caster.getActingPlayer().decreaseCharges(_skill.getChargeConsumeCount()))
{
return false;
}
}
// Consume skill reduced item on success.

7
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/Skill.java
View File

@ -163,6 +163,7 @@ public final class Skill implements IIdentifiable
private final int _minPledgeClass;
private final int _soulMaxConsume;
private final int _chargeConsume;
private final boolean _isTriggeredSkill; // If true the skill will take activation buff slot instead of a normal buff slot
private final int _effectPoint;
@ -380,6 +381,7 @@ public final class Skill implements IIdentifiable
_minPledgeClass = set.getInt("minPledgeClass", 0);
_soulMaxConsume = set.getInt("soulMaxConsumeCount", 0);
_chargeConsume = set.getInt("chargeConsume", 0);
_isTriggeredSkill = set.getBoolean("isTriggeredSkill", false);
_effectPoint = set.getInt("effectPoint", 0);
@ -1063,6 +1065,11 @@ public final class Skill implements IIdentifiable
return _soulMaxConsume;
}
public int getChargeConsumeCount()
{
return _chargeConsume;
}
public boolean isStayAfterDeath()
{
return _stayAfterDeath || _irreplacableBuff || _isNecessaryToggle;

15
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -484,10 +484,19 @@ public class SkillCaster implements Runnable
caster.sendPacket(su);
}
// Consume Souls if necessary
if (caster.isPlayer() && (_skill.getMaxSoulConsumeCount() > 0) && !caster.getActingPlayer().decreaseSouls(_skill.getMaxSoulConsumeCount(), _skill))
if (caster.isPlayer())
{
return false;
// Consume Souls if necessary.
if ((_skill.getMaxSoulConsumeCount() > 0) && !caster.getActingPlayer().decreaseSouls(_skill.getMaxSoulConsumeCount(), _skill))
{
return false;
}
// Consume charges if necessary.
if ((_skill.getChargeConsumeCount() > 0) && !caster.getActingPlayer().decreaseCharges(_skill.getChargeConsumeCount()))
{
return false;
}
}
// Consume skill reduced item on success.

7
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/Skill.java
View File

@ -163,6 +163,7 @@ public final class Skill implements IIdentifiable
private final int _minPledgeClass;
private final int _soulMaxConsume;
private final int _chargeConsume;
private final boolean _isTriggeredSkill; // If true the skill will take activation buff slot instead of a normal buff slot
private final int _effectPoint;
@ -380,6 +381,7 @@ public final class Skill implements IIdentifiable
_minPledgeClass = set.getInt("minPledgeClass", 0);
_soulMaxConsume = set.getInt("soulMaxConsumeCount", 0);
_chargeConsume = set.getInt("chargeConsume", 0);
_isTriggeredSkill = set.getBoolean("isTriggeredSkill", false);
_effectPoint = set.getInt("effectPoint", 0);
@ -1063,6 +1065,11 @@ public final class Skill implements IIdentifiable
return _soulMaxConsume;
}
public int getChargeConsumeCount()
{
return _chargeConsume;
}
public boolean isStayAfterDeath()
{
return _stayAfterDeath || _irreplacableBuff || _isNecessaryToggle;

15
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -484,10 +484,19 @@ public class SkillCaster implements Runnable
caster.sendPacket(su);
}
// Consume Souls if necessary
if (caster.isPlayer() && (_skill.getMaxSoulConsumeCount() > 0) && !caster.getActingPlayer().decreaseSouls(_skill.getMaxSoulConsumeCount(), _skill))
if (caster.isPlayer())
{
return false;
// Consume Souls if necessary.
if ((_skill.getMaxSoulConsumeCount() > 0) && !caster.getActingPlayer().decreaseSouls(_skill.getMaxSoulConsumeCount(), _skill))
{
return false;
}
// Consume charges if necessary.
if ((_skill.getChargeConsumeCount() > 0) && !caster.getActingPlayer().decreaseCharges(_skill.getChargeConsumeCount()))
{
return false;
}
}
// Consume skill reduced item on success.

7
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/skills/Skill.java
View File

@ -163,6 +163,7 @@ public final class Skill implements IIdentifiable
private final int _minPledgeClass;
private final int _soulMaxConsume;
private final int _chargeConsume;
private final boolean _isTriggeredSkill; // If true the skill will take activation buff slot instead of a normal buff slot
private final int _effectPoint;
@ -380,6 +381,7 @@ public final class Skill implements IIdentifiable
_minPledgeClass = set.getInt("minPledgeClass", 0);
_soulMaxConsume = set.getInt("soulMaxConsumeCount", 0);
_chargeConsume = set.getInt("chargeConsume", 0);
_isTriggeredSkill = set.getBoolean("isTriggeredSkill", false);
_effectPoint = set.getInt("effectPoint", 0);
@ -1063,6 +1065,11 @@ public final class Skill implements IIdentifiable
return _soulMaxConsume;
}
public int getChargeConsumeCount()
{
return _chargeConsume;
}
public boolean isStayAfterDeath()
{
return _stayAfterDeath || _irreplacableBuff || _isNecessaryToggle;

15
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -484,10 +484,19 @@ public class SkillCaster implements Runnable
caster.sendPacket(su);
}
// Consume Souls if necessary
if (caster.isPlayer() && (_skill.getMaxSoulConsumeCount() > 0) && !caster.getActingPlayer().decreaseSouls(_skill.getMaxSoulConsumeCount(), _skill))
if (caster.isPlayer())
{
return false;
// Consume Souls if necessary.
if ((_skill.getMaxSoulConsumeCount() > 0) && !caster.getActingPlayer().decreaseSouls(_skill.getMaxSoulConsumeCount(), _skill))
{
return false;
}
// Consume charges if necessary.
if ((_skill.getChargeConsumeCount() > 0) && !caster.getActingPlayer().decreaseCharges(_skill.getChargeConsumeCount()))
{
return false;
}
}
// Consume skill reduced item on success.

7
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/skills/Skill.java
View File

@ -163,6 +163,7 @@ public final class Skill implements IIdentifiable
private final int _minPledgeClass;
private final int _soulMaxConsume;
private final int _chargeConsume;
private final boolean _isTriggeredSkill; // If true the skill will take activation buff slot instead of a normal buff slot
private final int _effectPoint;
@ -380,6 +381,7 @@ public final class Skill implements IIdentifiable
_minPledgeClass = set.getInt("minPledgeClass", 0);
_soulMaxConsume = set.getInt("soulMaxConsumeCount", 0);
_chargeConsume = set.getInt("chargeConsume", 0);
_isTriggeredSkill = set.getBoolean("isTriggeredSkill", false);
_effectPoint = set.getInt("effectPoint", 0);
@ -1063,6 +1065,11 @@ public final class Skill implements IIdentifiable
return _soulMaxConsume;
}
public int getChargeConsumeCount()
{
return _chargeConsume;
}
public boolean isStayAfterDeath()
{
return _stayAfterDeath || _irreplacableBuff || _isNecessaryToggle;

15
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -484,10 +484,19 @@ public class SkillCaster implements Runnable
caster.sendPacket(su);
}
// Consume Souls if necessary
if (caster.isPlayer() && (_skill.getMaxSoulConsumeCount() > 0) && !caster.getActingPlayer().decreaseSouls(_skill.getMaxSoulConsumeCount(), _skill))
if (caster.isPlayer())
{
return false;
// Consume Souls if necessary.
if ((_skill.getMaxSoulConsumeCount() > 0) && !caster.getActingPlayer().decreaseSouls(_skill.getMaxSoulConsumeCount(), _skill))
{
return false;
}
// Consume charges if necessary.
if ((_skill.getChargeConsumeCount() > 0) && !caster.getActingPlayer().decreaseCharges(_skill.getChargeConsumeCount()))
{
return false;
}
}
// Consume skill reduced item on success.

7
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/Skill.java
View File

@ -163,6 +163,7 @@ public final class Skill implements IIdentifiable
private final int _minPledgeClass;
private final int _soulMaxConsume;
private final int _chargeConsume;
private final boolean _isTriggeredSkill; // If true the skill will take activation buff slot instead of a normal buff slot
private final int _effectPoint;
@ -380,6 +381,7 @@ public final class Skill implements IIdentifiable
_minPledgeClass = set.getInt("minPledgeClass", 0);
_soulMaxConsume = set.getInt("soulMaxConsumeCount", 0);
_chargeConsume = set.getInt("chargeConsume", 0);
_isTriggeredSkill = set.getBoolean("isTriggeredSkill", false);
_effectPoint = set.getInt("effectPoint", 0);
@ -1063,6 +1065,11 @@ public final class Skill implements IIdentifiable
return _soulMaxConsume;
}
public int getChargeConsumeCount()
{
return _chargeConsume;
}
public boolean isStayAfterDeath()
{
return _stayAfterDeath || _irreplacableBuff || _isNecessaryToggle;

15
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -484,10 +484,19 @@ public class SkillCaster implements Runnable
caster.sendPacket(su);
}
// Consume Souls if necessary
if (caster.isPlayer() && (_skill.getMaxSoulConsumeCount() > 0) && !caster.getActingPlayer().decreaseSouls(_skill.getMaxSoulConsumeCount(), _skill))
if (caster.isPlayer())
{
return false;
// Consume Souls if necessary.
if ((_skill.getMaxSoulConsumeCount() > 0) && !caster.getActingPlayer().decreaseSouls(_skill.getMaxSoulConsumeCount(), _skill))
{
return false;
}
// Consume charges if necessary.
if ((_skill.getChargeConsumeCount() > 0) && !caster.getActingPlayer().decreaseCharges(_skill.getChargeConsumeCount()))
{
return false;
}
}
// Consume skill reduced item on success.

7
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/Skill.java
View File

@ -163,6 +163,7 @@ public final class Skill implements IIdentifiable
private final int _minPledgeClass;
private final int _soulMaxConsume;
private final int _chargeConsume;
private final boolean _isTriggeredSkill; // If true the skill will take activation buff slot instead of a normal buff slot
private final int _effectPoint;
@ -380,6 +381,7 @@ public final class Skill implements IIdentifiable
_minPledgeClass = set.getInt("minPledgeClass", 0);
_soulMaxConsume = set.getInt("soulMaxConsumeCount", 0);
_chargeConsume = set.getInt("chargeConsume", 0);
_isTriggeredSkill = set.getBoolean("isTriggeredSkill", false);
_effectPoint = set.getInt("effectPoint", 0);
@ -1063,6 +1065,11 @@ public final class Skill implements IIdentifiable
return _soulMaxConsume;
}
public int getChargeConsumeCount()
{
return _chargeConsume;
}
public boolean isStayAfterDeath()
{
return _stayAfterDeath || _irreplacableBuff || _isNecessaryToggle;

15
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -484,10 +484,19 @@ public class SkillCaster implements Runnable
caster.sendPacket(su);
}
// Consume Souls if necessary
if (caster.isPlayer() && (_skill.getMaxSoulConsumeCount() > 0) && !caster.getActingPlayer().decreaseSouls(_skill.getMaxSoulConsumeCount(), _skill))
if (caster.isPlayer())
{
return false;
// Consume Souls if necessary.
if ((_skill.getMaxSoulConsumeCount() > 0) && !caster.getActingPlayer().decreaseSouls(_skill.getMaxSoulConsumeCount(), _skill))
{
return false;
}
// Consume charges if necessary.
if ((_skill.getChargeConsumeCount() > 0) && !caster.getActingPlayer().decreaseCharges(_skill.getChargeConsumeCount()))
{
return false;
}
}
// Consume skill reduced item on success.

7
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/Skill.java
View File

@ -163,6 +163,7 @@ public final class Skill implements IIdentifiable
private final int _minPledgeClass;
private final int _soulMaxConsume;
private final int _chargeConsume;
private final boolean _isTriggeredSkill; // If true the skill will take activation buff slot instead of a normal buff slot
private final int _effectPoint;
@ -380,6 +381,7 @@ public final class Skill implements IIdentifiable
_minPledgeClass = set.getInt("minPledgeClass", 0);
_soulMaxConsume = set.getInt("soulMaxConsumeCount", 0);
_chargeConsume = set.getInt("chargeConsume", 0);
_isTriggeredSkill = set.getBoolean("isTriggeredSkill", false);
_effectPoint = set.getInt("effectPoint", 0);
@ -1063,6 +1065,11 @@ public final class Skill implements IIdentifiable
return _soulMaxConsume;
}
public int getChargeConsumeCount()
{
return _chargeConsume;
}
public boolean isStayAfterDeath()
{
return _stayAfterDeath || _irreplacableBuff || _isNecessaryToggle;

15
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -484,10 +484,19 @@ public class SkillCaster implements Runnable
caster.sendPacket(su);
}
// Consume Souls if necessary
if (caster.isPlayer() && (_skill.getMaxSoulConsumeCount() > 0) && !caster.getActingPlayer().decreaseSouls(_skill.getMaxSoulConsumeCount(), _skill))
if (caster.isPlayer())
{
return false;
// Consume Souls if necessary.
if ((_skill.getMaxSoulConsumeCount() > 0) && !caster.getActingPlayer().decreaseSouls(_skill.getMaxSoulConsumeCount(), _skill))
{
return false;
}
// Consume charges if necessary.
if ((_skill.getChargeConsumeCount() > 0) && !caster.getActingPlayer().decreaseCharges(_skill.getChargeConsumeCount()))
{
return false;
}
}
// Consume skill reduced item on success.

7
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/skills/Skill.java
View File

@ -163,6 +163,7 @@ public final class Skill implements IIdentifiable
private final int _minPledgeClass;
private final int _soulMaxConsume;
private final int _chargeConsume;
private final boolean _isTriggeredSkill; // If true the skill will take activation buff slot instead of a normal buff slot
private final int _effectPoint;
@ -380,6 +381,7 @@ public final class Skill implements IIdentifiable
_minPledgeClass = set.getInt("minPledgeClass", 0);
_soulMaxConsume = set.getInt("soulMaxConsumeCount", 0);
_chargeConsume = set.getInt("chargeConsume", 0);
_isTriggeredSkill = set.getBoolean("isTriggeredSkill", false);
_effectPoint = set.getInt("effectPoint", 0);
@ -1063,6 +1065,11 @@ public final class Skill implements IIdentifiable
return _soulMaxConsume;
}
public int getChargeConsumeCount()
{
return _chargeConsume;
}
public boolean isStayAfterDeath()
{
return _stayAfterDeath || _irreplacableBuff || _isNecessaryToggle;

15
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -484,10 +484,19 @@ public class SkillCaster implements Runnable
caster.sendPacket(su);
}
// Consume Souls if necessary
if (caster.isPlayer() && (_skill.getMaxSoulConsumeCount() > 0) && !caster.getActingPlayer().decreaseSouls(_skill.getMaxSoulConsumeCount(), _skill))
if (caster.isPlayer())
{
return false;
// Consume Souls if necessary.
if ((_skill.getMaxSoulConsumeCount() > 0) && !caster.getActingPlayer().decreaseSouls(_skill.getMaxSoulConsumeCount(), _skill))
{
return false;
}
// Consume charges if necessary.
if ((_skill.getChargeConsumeCount() > 0) && !caster.getActingPlayer().decreaseCharges(_skill.getChargeConsumeCount()))
{
return false;
}
}
// Consume skill reduced item on success.