From e6be147b64b8c063b669ba3f2d7f3fa75380f512 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 11 Oct 2017 14:25:55 +0000 Subject: [PATCH] Skill parameter to consume fame points. --- .../gameserver/model/skills/Skill.java | 11 +++++++++ .../gameserver/model/skills/SkillCaster.java | 23 ++++++++++++++++++- .../gameserver/model/skills/Skill.java | 11 +++++++++ .../gameserver/model/skills/SkillCaster.java | 23 ++++++++++++++++++- .../gameserver/model/skills/Skill.java | 11 +++++++++ .../gameserver/model/skills/SkillCaster.java | 23 ++++++++++++++++++- .../gameserver/model/skills/Skill.java | 11 +++++++++ .../gameserver/model/skills/SkillCaster.java | 23 ++++++++++++++++++- 8 files changed, 132 insertions(+), 4 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/Skill.java index 66f8e4461c..c26837705a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -99,6 +99,8 @@ public final class Skill implements IIdentifiable private final int _itemConsumeCount; /** Id of item consumed by this skill from caster. */ private final int _itemConsumeId; + /** Fame points consumed by this skill from caster */ + private final int _famePointConsume; /** Clan points consumed by this skill from caster's clan */ private final int _clanRepConsume; /** Cast range: how far can be the target. */ @@ -229,6 +231,7 @@ public final class Skill implements IIdentifiable _hpConsume = set.getInt("hpConsume", 0); _itemConsumeCount = set.getInt("itemConsumeCount", 0); _itemConsumeId = set.getInt("itemConsumeId", 0); + _famePointConsume = set.getInt("famePointConsume", 0); _clanRepConsume = set.getInt("clanRepConsume", 0); _castRange = set.getInt("castRange", -1); @@ -727,6 +730,14 @@ public final class Skill implements IIdentifiable return _itemConsumeId; } + /** + * @return Fame points consumed by this skill from caster + */ + public int getFamePointConsume() + { + return _famePointConsume; + } + /** * @return Clan points consumed by this skill from caster's clan */ diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java index 0dc48d41ab..619a0e174a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -343,11 +343,26 @@ public class SkillCaster implements Runnable if (caster.isPlayer()) { final L2PcInstance player = caster.getActingPlayer(); - final L2Clan clan = player.getClan(); + + // Consume fame points + if (_skill.getFamePointConsume() > 0) + { + if (player.getFame() < _skill.getFamePointConsume()) + { + player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_FAME_TO_DO_THAT); + return false; + } + player.setFame(player.getFame() - _skill.getFamePointConsume()); + + final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S1_FAME_HAS_BEEN_CONSUMED); + msg.addInt(_skill.getFamePointConsume()); + player.sendPacket(msg); + } // Consume clan reputation points if (_skill.getClanRepConsume() > 0) { + final L2Clan clan = player.getClan(); if ((clan == null) || (clan.getReputationScore() < _skill.getClanRepConsume())) { player.sendPacket(SystemMessageId.THE_CLAN_REPUTATION_IS_TOO_LOW); @@ -981,6 +996,12 @@ public class SkillCaster implements Runnable return false; } + if (player.getFame() < skill.getFamePointConsume()) + { + player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_FAME_TO_DO_THAT); + return false; + } + // Consume clan reputation points if (skill.getClanRepConsume() > 0) { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/Skill.java index c1894f4a4e..e49b37c6fc 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -99,6 +99,8 @@ public final class Skill implements IIdentifiable private final int _itemConsumeCount; /** Id of item consumed by this skill from caster. */ private final int _itemConsumeId; + /** Fame points consumed by this skill from caster */ + private final int _famePointConsume; /** Clan points consumed by this skill from caster's clan */ private final int _clanRepConsume; /** Cast range: how far can be the target. */ @@ -229,6 +231,7 @@ public final class Skill implements IIdentifiable _hpConsume = set.getInt("hpConsume", 0); _itemConsumeCount = set.getInt("itemConsumeCount", 0); _itemConsumeId = set.getInt("itemConsumeId", 0); + _famePointConsume = set.getInt("famePointConsume", 0); _clanRepConsume = set.getInt("clanRepConsume", 0); _castRange = set.getInt("castRange", -1); @@ -727,6 +730,14 @@ public final class Skill implements IIdentifiable return _itemConsumeId; } + /** + * @return Fame points consumed by this skill from caster + */ + public int getFamePointConsume() + { + return _famePointConsume; + } + /** * @return Clan points consumed by this skill from caster's clan */ diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java index 0dc48d41ab..619a0e174a 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -343,11 +343,26 @@ public class SkillCaster implements Runnable if (caster.isPlayer()) { final L2PcInstance player = caster.getActingPlayer(); - final L2Clan clan = player.getClan(); + + // Consume fame points + if (_skill.getFamePointConsume() > 0) + { + if (player.getFame() < _skill.getFamePointConsume()) + { + player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_FAME_TO_DO_THAT); + return false; + } + player.setFame(player.getFame() - _skill.getFamePointConsume()); + + final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S1_FAME_HAS_BEEN_CONSUMED); + msg.addInt(_skill.getFamePointConsume()); + player.sendPacket(msg); + } // Consume clan reputation points if (_skill.getClanRepConsume() > 0) { + final L2Clan clan = player.getClan(); if ((clan == null) || (clan.getReputationScore() < _skill.getClanRepConsume())) { player.sendPacket(SystemMessageId.THE_CLAN_REPUTATION_IS_TOO_LOW); @@ -981,6 +996,12 @@ public class SkillCaster implements Runnable return false; } + if (player.getFame() < skill.getFamePointConsume()) + { + player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_FAME_TO_DO_THAT); + return false; + } + // Consume clan reputation points if (skill.getClanRepConsume() > 0) { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/Skill.java index c1894f4a4e..e49b37c6fc 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -99,6 +99,8 @@ public final class Skill implements IIdentifiable private final int _itemConsumeCount; /** Id of item consumed by this skill from caster. */ private final int _itemConsumeId; + /** Fame points consumed by this skill from caster */ + private final int _famePointConsume; /** Clan points consumed by this skill from caster's clan */ private final int _clanRepConsume; /** Cast range: how far can be the target. */ @@ -229,6 +231,7 @@ public final class Skill implements IIdentifiable _hpConsume = set.getInt("hpConsume", 0); _itemConsumeCount = set.getInt("itemConsumeCount", 0); _itemConsumeId = set.getInt("itemConsumeId", 0); + _famePointConsume = set.getInt("famePointConsume", 0); _clanRepConsume = set.getInt("clanRepConsume", 0); _castRange = set.getInt("castRange", -1); @@ -727,6 +730,14 @@ public final class Skill implements IIdentifiable return _itemConsumeId; } + /** + * @return Fame points consumed by this skill from caster + */ + public int getFamePointConsume() + { + return _famePointConsume; + } + /** * @return Clan points consumed by this skill from caster's clan */ diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java index 0dc48d41ab..619a0e174a 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -343,11 +343,26 @@ public class SkillCaster implements Runnable if (caster.isPlayer()) { final L2PcInstance player = caster.getActingPlayer(); - final L2Clan clan = player.getClan(); + + // Consume fame points + if (_skill.getFamePointConsume() > 0) + { + if (player.getFame() < _skill.getFamePointConsume()) + { + player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_FAME_TO_DO_THAT); + return false; + } + player.setFame(player.getFame() - _skill.getFamePointConsume()); + + final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S1_FAME_HAS_BEEN_CONSUMED); + msg.addInt(_skill.getFamePointConsume()); + player.sendPacket(msg); + } // Consume clan reputation points if (_skill.getClanRepConsume() > 0) { + final L2Clan clan = player.getClan(); if ((clan == null) || (clan.getReputationScore() < _skill.getClanRepConsume())) { player.sendPacket(SystemMessageId.THE_CLAN_REPUTATION_IS_TOO_LOW); @@ -981,6 +996,12 @@ public class SkillCaster implements Runnable return false; } + if (player.getFame() < skill.getFamePointConsume()) + { + player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_FAME_TO_DO_THAT); + return false; + } + // Consume clan reputation points if (skill.getClanRepConsume() > 0) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/Skill.java index c1894f4a4e..e49b37c6fc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -99,6 +99,8 @@ public final class Skill implements IIdentifiable private final int _itemConsumeCount; /** Id of item consumed by this skill from caster. */ private final int _itemConsumeId; + /** Fame points consumed by this skill from caster */ + private final int _famePointConsume; /** Clan points consumed by this skill from caster's clan */ private final int _clanRepConsume; /** Cast range: how far can be the target. */ @@ -229,6 +231,7 @@ public final class Skill implements IIdentifiable _hpConsume = set.getInt("hpConsume", 0); _itemConsumeCount = set.getInt("itemConsumeCount", 0); _itemConsumeId = set.getInt("itemConsumeId", 0); + _famePointConsume = set.getInt("famePointConsume", 0); _clanRepConsume = set.getInt("clanRepConsume", 0); _castRange = set.getInt("castRange", -1); @@ -727,6 +730,14 @@ public final class Skill implements IIdentifiable return _itemConsumeId; } + /** + * @return Fame points consumed by this skill from caster + */ + public int getFamePointConsume() + { + return _famePointConsume; + } + /** * @return Clan points consumed by this skill from caster's clan */ diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java index 0dc48d41ab..619a0e174a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -343,11 +343,26 @@ public class SkillCaster implements Runnable if (caster.isPlayer()) { final L2PcInstance player = caster.getActingPlayer(); - final L2Clan clan = player.getClan(); + + // Consume fame points + if (_skill.getFamePointConsume() > 0) + { + if (player.getFame() < _skill.getFamePointConsume()) + { + player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_FAME_TO_DO_THAT); + return false; + } + player.setFame(player.getFame() - _skill.getFamePointConsume()); + + final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S1_FAME_HAS_BEEN_CONSUMED); + msg.addInt(_skill.getFamePointConsume()); + player.sendPacket(msg); + } // Consume clan reputation points if (_skill.getClanRepConsume() > 0) { + final L2Clan clan = player.getClan(); if ((clan == null) || (clan.getReputationScore() < _skill.getClanRepConsume())) { player.sendPacket(SystemMessageId.THE_CLAN_REPUTATION_IS_TOO_LOW); @@ -981,6 +996,12 @@ public class SkillCaster implements Runnable return false; } + if (player.getFame() < skill.getFamePointConsume()) + { + player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_FAME_TO_DO_THAT); + return false; + } + // Consume clan reputation points if (skill.getClanRepConsume() > 0) {