diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/village_master/ClanMaster/9000-01.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/village_master/ClanMaster/9000-01.htm index ef437e0f20..d844357b68 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/village_master/ClanMaster/9000-01.htm +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/village_master/ClanMaster/9000-01.htm @@ -2,6 +2,5 @@ - \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index 91b3880f5b..9a35e6a19e 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -16,31 +16,25 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import java.util.List; import java.util.logging.Logger; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.ClanTable; -import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; -import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; -import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -238,10 +232,6 @@ public class VillageMasterInstance extends NpcInstance player.broadcastPacket(new MagicSkillLaunched(player, 5103, 1)); } } - else if (actualCommand.equalsIgnoreCase("learn_clan_skills")) - { - showPledgeSkillList(player); - } else { super.onBypassFeedback(player, command); @@ -322,52 +312,6 @@ public class VillageMasterInstance extends NpcInstance clan.updateClanInDB(); } - /** - * this displays PledgeSkillList to the player. - * @param player - */ - public static void showPledgeSkillList(PlayerInstance player) - { - if (!player.isClanLeader()) - { - final NpcHtmlMessage html = new NpcHtmlMessage(); - html.setFile(player, "data/html/villagemaster/NotClanLeader.htm"); - player.sendPacket(html); - player.sendPacket(ActionFailed.STATIC_PACKET); - return; - } - - final List skills = SkillTreesData.getInstance().getAvailablePledgeSkills(player.getClan()); - - if (skills.isEmpty()) - { - if (player.getClan().getLevel() < 8) - { - final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ANY_FURTHER_SKILLS_TO_LEARN_COME_BACK_WHEN_YOU_HAVE_REACHED_LEVEL_S1); - if (player.getClan().getLevel() < 5) - { - sm.addInt(5); - } - else - { - sm.addInt(player.getClan().getLevel() + 1); - } - player.sendPacket(sm); - } - else - { - final NpcHtmlMessage html = new NpcHtmlMessage(); - html.setFile(player, "data/html/villagemaster/NoMoreSkills.htm"); - player.sendPacket(html); - } - } - else - { - player.sendPacket(new ExAcquirableSkillListByClass(skills, AcquireSkillType.PLEDGE)); - } - player.sendPacket(ActionFailed.STATIC_PACKET); - } - private static boolean isValidName(String name) { Pattern pattern; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index 68aff4bd76..eeca44ad2e 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -31,7 +31,6 @@ import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FishermanInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.actor.instance.VillageMasterInstance; import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.base.SubClass; import org.l2jmobius.gameserver.model.clan.Clan; @@ -182,57 +181,6 @@ public final class RequestAcquireSkill implements IClientIncomingPacket } break; } - case PLEDGE: - { - if (!player.isClanLeader()) - { - return; - } - - final Clan clan = player.getClan(); - final int repCost = (int) s.getLevelUpSp(); // Hopefully not greater that max int. - if (clan.getReputationScore() >= repCost) - { - if (Config.LIFE_CRYSTAL_NEEDED) - { - for (ItemHolder item : s.getRequiredItems()) - { - if (!player.destroyItemByItemId("Consume", item.getId(), item.getCount(), trainer, false)) - { - // Doesn't have required item. - player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - VillageMasterInstance.showPledgeSkillList(player); - return; - } - - final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED); - sm.addItemName(item.getId()); - sm.addLong(item.getCount()); - player.sendPacket(sm); - } - } - - clan.takeReputationScore(repCost, true); - - final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); - cr.addInt(repCost); - player.sendPacket(cr); - - clan.addNewSkill(skill); - - clan.broadcastToOnlineMembers(new PledgeSkillList(clan)); - - player.sendPacket(new AcquireSkillDone()); - - VillageMasterInstance.showPledgeSkillList(player); - } - else - { - player.sendPacket(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION); - VillageMasterInstance.showPledgeSkillList(player); - } - break; - } case SUBPLEDGE: { if (!player.isClanLeader() || !player.hasClanPrivilege(ClanPrivilege.CL_TROOPS_FAME)) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/village_master/ClanMaster/9000-01.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/village_master/ClanMaster/9000-01.htm index ef437e0f20..d844357b68 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/village_master/ClanMaster/9000-01.htm +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/village_master/ClanMaster/9000-01.htm @@ -2,6 +2,5 @@ - \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index 91b3880f5b..9a35e6a19e 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -16,31 +16,25 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import java.util.List; import java.util.logging.Logger; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.ClanTable; -import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; -import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; -import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -238,10 +232,6 @@ public class VillageMasterInstance extends NpcInstance player.broadcastPacket(new MagicSkillLaunched(player, 5103, 1)); } } - else if (actualCommand.equalsIgnoreCase("learn_clan_skills")) - { - showPledgeSkillList(player); - } else { super.onBypassFeedback(player, command); @@ -322,52 +312,6 @@ public class VillageMasterInstance extends NpcInstance clan.updateClanInDB(); } - /** - * this displays PledgeSkillList to the player. - * @param player - */ - public static void showPledgeSkillList(PlayerInstance player) - { - if (!player.isClanLeader()) - { - final NpcHtmlMessage html = new NpcHtmlMessage(); - html.setFile(player, "data/html/villagemaster/NotClanLeader.htm"); - player.sendPacket(html); - player.sendPacket(ActionFailed.STATIC_PACKET); - return; - } - - final List skills = SkillTreesData.getInstance().getAvailablePledgeSkills(player.getClan()); - - if (skills.isEmpty()) - { - if (player.getClan().getLevel() < 8) - { - final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ANY_FURTHER_SKILLS_TO_LEARN_COME_BACK_WHEN_YOU_HAVE_REACHED_LEVEL_S1); - if (player.getClan().getLevel() < 5) - { - sm.addInt(5); - } - else - { - sm.addInt(player.getClan().getLevel() + 1); - } - player.sendPacket(sm); - } - else - { - final NpcHtmlMessage html = new NpcHtmlMessage(); - html.setFile(player, "data/html/villagemaster/NoMoreSkills.htm"); - player.sendPacket(html); - } - } - else - { - player.sendPacket(new ExAcquirableSkillListByClass(skills, AcquireSkillType.PLEDGE)); - } - player.sendPacket(ActionFailed.STATIC_PACKET); - } - private static boolean isValidName(String name) { Pattern pattern; diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index 4a28bd21cb..1234519602 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -31,7 +31,6 @@ import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FishermanInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.actor.instance.VillageMasterInstance; import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.base.SubClass; import org.l2jmobius.gameserver.model.clan.Clan; @@ -182,57 +181,6 @@ public final class RequestAcquireSkill implements IClientIncomingPacket } break; } - case PLEDGE: - { - if (!player.isClanLeader()) - { - return; - } - - final Clan clan = player.getClan(); - final int repCost = (int) s.getLevelUpSp(); // Hopefully not greater that max int. - if (clan.getReputationScore() >= repCost) - { - if (Config.LIFE_CRYSTAL_NEEDED) - { - for (ItemHolder item : s.getRequiredItems()) - { - if (!player.destroyItemByItemId("Consume", item.getId(), item.getCount(), trainer, false)) - { - // Doesn't have required item. - player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - VillageMasterInstance.showPledgeSkillList(player); - return; - } - - final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED); - sm.addItemName(item.getId()); - sm.addLong(item.getCount()); - player.sendPacket(sm); - } - } - - clan.takeReputationScore(repCost, true); - - final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); - cr.addInt(repCost); - player.sendPacket(cr); - - clan.addNewSkill(skill); - - clan.broadcastToOnlineMembers(new PledgeSkillList(clan)); - - player.sendPacket(new AcquireSkillDone()); - - VillageMasterInstance.showPledgeSkillList(player); - } - else - { - player.sendPacket(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION); - VillageMasterInstance.showPledgeSkillList(player); - } - break; - } case SUBPLEDGE: { if (!player.isClanLeader() || !player.hasClanPrivilege(ClanPrivilege.CL_TROOPS_FAME)) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/village_master/ClanMaster/9000-01.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/village_master/ClanMaster/9000-01.htm index ef437e0f20..d844357b68 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/village_master/ClanMaster/9000-01.htm +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/village_master/ClanMaster/9000-01.htm @@ -2,6 +2,5 @@ - \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index 91b3880f5b..9a35e6a19e 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -16,31 +16,25 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import java.util.List; import java.util.logging.Logger; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.ClanTable; -import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; -import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; -import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -238,10 +232,6 @@ public class VillageMasterInstance extends NpcInstance player.broadcastPacket(new MagicSkillLaunched(player, 5103, 1)); } } - else if (actualCommand.equalsIgnoreCase("learn_clan_skills")) - { - showPledgeSkillList(player); - } else { super.onBypassFeedback(player, command); @@ -322,52 +312,6 @@ public class VillageMasterInstance extends NpcInstance clan.updateClanInDB(); } - /** - * this displays PledgeSkillList to the player. - * @param player - */ - public static void showPledgeSkillList(PlayerInstance player) - { - if (!player.isClanLeader()) - { - final NpcHtmlMessage html = new NpcHtmlMessage(); - html.setFile(player, "data/html/villagemaster/NotClanLeader.htm"); - player.sendPacket(html); - player.sendPacket(ActionFailed.STATIC_PACKET); - return; - } - - final List skills = SkillTreesData.getInstance().getAvailablePledgeSkills(player.getClan()); - - if (skills.isEmpty()) - { - if (player.getClan().getLevel() < 8) - { - final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ANY_FURTHER_SKILLS_TO_LEARN_COME_BACK_WHEN_YOU_HAVE_REACHED_LEVEL_S1); - if (player.getClan().getLevel() < 5) - { - sm.addInt(5); - } - else - { - sm.addInt(player.getClan().getLevel() + 1); - } - player.sendPacket(sm); - } - else - { - final NpcHtmlMessage html = new NpcHtmlMessage(); - html.setFile(player, "data/html/villagemaster/NoMoreSkills.htm"); - player.sendPacket(html); - } - } - else - { - player.sendPacket(new ExAcquirableSkillListByClass(skills, AcquireSkillType.PLEDGE)); - } - player.sendPacket(ActionFailed.STATIC_PACKET); - } - private static boolean isValidName(String name) { Pattern pattern; diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index 4a28bd21cb..1234519602 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -31,7 +31,6 @@ import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FishermanInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.actor.instance.VillageMasterInstance; import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.base.SubClass; import org.l2jmobius.gameserver.model.clan.Clan; @@ -182,57 +181,6 @@ public final class RequestAcquireSkill implements IClientIncomingPacket } break; } - case PLEDGE: - { - if (!player.isClanLeader()) - { - return; - } - - final Clan clan = player.getClan(); - final int repCost = (int) s.getLevelUpSp(); // Hopefully not greater that max int. - if (clan.getReputationScore() >= repCost) - { - if (Config.LIFE_CRYSTAL_NEEDED) - { - for (ItemHolder item : s.getRequiredItems()) - { - if (!player.destroyItemByItemId("Consume", item.getId(), item.getCount(), trainer, false)) - { - // Doesn't have required item. - player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - VillageMasterInstance.showPledgeSkillList(player); - return; - } - - final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED); - sm.addItemName(item.getId()); - sm.addLong(item.getCount()); - player.sendPacket(sm); - } - } - - clan.takeReputationScore(repCost, true); - - final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); - cr.addInt(repCost); - player.sendPacket(cr); - - clan.addNewSkill(skill); - - clan.broadcastToOnlineMembers(new PledgeSkillList(clan)); - - player.sendPacket(new AcquireSkillDone()); - - VillageMasterInstance.showPledgeSkillList(player); - } - else - { - player.sendPacket(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION); - VillageMasterInstance.showPledgeSkillList(player); - } - break; - } case SUBPLEDGE: { if (!player.isClanLeader() || !player.hasClanPrivilege(ClanPrivilege.CL_TROOPS_FAME))