From 8d30fcb7d023bcc23f0e6ad2d75813841f6ef4c6 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 11 May 2022 10:06:51 +0000 Subject: [PATCH] Updated clan privileges to match latest client. Contributed by CostyKiller. --- .../Nottingale/Nottingale.java | 2 +- .../ai/areas/Rune/Roiental/Roiental.java | 38 +++++++++++++--- .../CastleChamberlain/CastleChamberlain.java | 40 ++++++++--------- .../CastleCourtMagician.java | 2 +- .../CastleDoorManager/CastleDoorManager.java | 2 +- .../ClanHallDoorManager.java | 2 +- .../ClanHallManager/ClanHallManager.java | 6 +-- .../ai/others/ClanTrader/ClanTrader.java | 2 +- .../FortressSiegeManager.java | 4 +- .../SupportUnitCaptain.java | 2 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../scripts/vehicles/AirShipController.java | 2 +- .../model/actor/instance/FortManager.java | 8 ++-- .../l2jmobius/gameserver/model/clan/Clan.java | 2 +- .../gameserver/model/clan/ClanPrivilege.java | 44 +++++++++---------- .../clientpackets/RequestAcquireSkill.java | 2 +- .../RequestAcquireSkillInfo.java | 2 +- .../RequestExSetPledgeCrestLarge.java | 2 +- .../clientpackets/RequestGiveNickName.java | 2 +- .../clientpackets/RequestJoinSiege.java | 2 +- .../clientpackets/RequestPledgePower.java | 2 +- .../RequestPledgeSetAcademyMaster.java | 2 +- .../clientpackets/RequestSetPledgeCrest.java | 2 +- .../clientpackets/RequestStartPledgeWar.java | 2 +- .../clientpackets/RequestStopPledgeWar.java | 2 +- .../RequestSurrenderPledgeWar.java | 2 +- .../SendWareHouseWithDrawList.java | 2 +- .../Nottingale/Nottingale.java | 2 +- .../ai/areas/Rune/Roiental/Roiental.java | 38 +++++++++++++--- .../CastleChamberlain/CastleChamberlain.java | 40 ++++++++--------- .../CastleCourtMagician.java | 2 +- .../CastleDoorManager/CastleDoorManager.java | 2 +- .../ClanHallDoorManager.java | 2 +- .../ClanHallManager/ClanHallManager.java | 6 +-- .../FortressSiegeManager.java | 4 +- .../SupportUnitCaptain.java | 2 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../scripts/vehicles/AirShipController.java | 2 +- .../model/actor/instance/FortManager.java | 8 ++-- .../l2jmobius/gameserver/model/clan/Clan.java | 2 +- .../gameserver/model/clan/ClanPrivilege.java | 44 +++++++++---------- .../clientpackets/RequestAcquireSkill.java | 2 +- .../RequestAcquireSkillInfo.java | 2 +- .../RequestExSetPledgeCrestLarge.java | 2 +- .../clientpackets/RequestGiveNickName.java | 2 +- .../clientpackets/RequestJoinSiege.java | 2 +- .../clientpackets/RequestPledgePower.java | 2 +- .../RequestPledgeSetAcademyMaster.java | 2 +- .../clientpackets/RequestSetPledgeCrest.java | 2 +- .../clientpackets/RequestStartPledgeWar.java | 2 +- .../clientpackets/RequestStopPledgeWar.java | 2 +- .../RequestSurrenderPledgeWar.java | 2 +- .../SendWareHouseWithDrawList.java | 2 +- .../Nottingale/Nottingale.java | 2 +- .../ai/areas/Rune/Roiental/Roiental.java | 38 +++++++++++++--- .../CastleChamberlain/CastleChamberlain.java | 40 ++++++++--------- .../CastleCourtMagician.java | 2 +- .../CastleDoorManager/CastleDoorManager.java | 2 +- .../ClanHallDoorManager.java | 2 +- .../ClanHallManager/ClanHallManager.java | 6 +-- .../FortressSiegeManager.java | 4 +- .../SupportUnitCaptain.java | 2 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../scripts/vehicles/AirShipController.java | 2 +- .../model/actor/instance/FortManager.java | 8 ++-- .../l2jmobius/gameserver/model/clan/Clan.java | 2 +- .../gameserver/model/clan/ClanPrivilege.java | 44 +++++++++---------- .../clientpackets/RequestAcquireSkill.java | 2 +- .../RequestAcquireSkillInfo.java | 2 +- .../RequestExSetPledgeCrestLarge.java | 2 +- .../clientpackets/RequestGiveNickName.java | 2 +- .../clientpackets/RequestJoinSiege.java | 2 +- .../clientpackets/RequestPledgePower.java | 2 +- .../RequestPledgeSetAcademyMaster.java | 2 +- .../clientpackets/RequestSetPledgeCrest.java | 2 +- .../clientpackets/RequestStartPledgeWar.java | 2 +- .../clientpackets/RequestStopPledgeWar.java | 2 +- .../RequestSurrenderPledgeWar.java | 2 +- .../SendWareHouseWithDrawList.java | 2 +- .../Nottingale/Nottingale.java | 2 +- .../ai/areas/Rune/Roiental/Roiental.java | 38 +++++++++++++--- .../CastleChamberlain/CastleChamberlain.java | 40 ++++++++--------- .../CastleCourtMagician.java | 2 +- .../CastleDoorManager/CastleDoorManager.java | 2 +- .../ClanHallDoorManager.java | 2 +- .../ClanHallManager/ClanHallManager.java | 6 +-- .../FortressSiegeManager.java | 4 +- .../SupportUnitCaptain.java | 2 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../scripts/vehicles/AirShipController.java | 2 +- .../model/actor/instance/FortManager.java | 8 ++-- .../l2jmobius/gameserver/model/clan/Clan.java | 2 +- .../gameserver/model/clan/ClanPrivilege.java | 44 +++++++++---------- .../clientpackets/RequestAcquireSkill.java | 2 +- .../RequestAcquireSkillInfo.java | 2 +- .../RequestExSetPledgeCrestLarge.java | 2 +- .../clientpackets/RequestGiveNickName.java | 2 +- .../clientpackets/RequestJoinSiege.java | 2 +- .../clientpackets/RequestPledgePower.java | 2 +- .../RequestPledgeSetAcademyMaster.java | 2 +- .../clientpackets/RequestSetPledgeCrest.java | 2 +- .../clientpackets/RequestStartPledgeWar.java | 2 +- .../clientpackets/RequestStopPledgeWar.java | 2 +- .../RequestSurrenderPledgeWar.java | 2 +- .../SendWareHouseWithDrawList.java | 2 +- 105 files changed, 413 insertions(+), 309 deletions(-) diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java index 43c01dcd8b..eedcc75645 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java @@ -68,7 +68,7 @@ public class Nottingale extends AbstractNpcAI { if (player.getClan() != null) { - if (player.hasClanPrivilege(ClanPrivilege.CL_SUMMON_AIRSHIP) && AirShipManager.getInstance().hasAirShipLicense(player.getClanId()) && !AirShipManager.getInstance().hasAirShip(player.getClanId())) + if (player.hasClanPrivilege(ClanPrivilege.CL_USE_FUNCTIONS) && AirShipManager.getInstance().hasAirShipLicense(player.getClanId()) && !AirShipManager.getInstance().hasAirShip(player.getClanId())) { htmltext = event; } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java index 77ea59eef5..e2a2dba97f 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java @@ -19,7 +19,9 @@ package ai.areas.Rune.Roiental; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.network.SystemMessageId; import ai.AbstractNpcAI; @@ -57,14 +59,22 @@ public class Roiental extends AbstractNpcAI { htmltext = "Roiental-NoLevel.html"; } - else if ((player.getClan() == null) || (player.getClan().getLevel() < CLAN_MIN_LVL_GB)) + else if (player.getClan() == null) + { + player.sendPacket(SystemMessageId.YOU_DO_NOT_BELONG_TO_ANY_CLAN); + } + else if ((player.getClan().getLevel() < CLAN_MIN_LVL_GB)) { htmltext = "Roiental-03a.html"; } - else if ((player.getClan() == null) || player.getClan().getVariables().hasVariable("TOH_DONE")) + else if (player.getClan().getVariables().hasVariable("TOH_DONE")) { htmltext = "Roiental-AlreadyDone.html"; } + else if (!player.hasClanPrivilege(ClanPrivilege.CL_THRONE_OF_HEROES)) + { + player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); + } else { htmltext = "Roiental-01a.html"; @@ -76,14 +86,22 @@ public class Roiental extends AbstractNpcAI { htmltext = "Roiental-NoLevel.html"; } - else if ((player.getClan() == null) || (player.getClan().getLevel() < CLAN_MIN_LVL_MR)) + else if (player.getClan() == null) + { + player.sendPacket(SystemMessageId.YOU_DO_NOT_BELONG_TO_ANY_CLAN); + } + else if ((player.getClan().getLevel() < CLAN_MIN_LVL_MR)) { htmltext = "Roiental-03b.html"; } - else if ((player.getClan() == null) || player.getClan().getVariables().hasVariable("TOH_DONE")) + else if (player.getClan().getVariables().hasVariable("TOH_DONE")) { htmltext = "Roiental-AlreadyDone.html"; } + else if (!player.hasClanPrivilege(ClanPrivilege.CL_THRONE_OF_HEROES)) + { + player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); + } else { htmltext = "Roiental-01b.html"; @@ -95,14 +113,22 @@ public class Roiental extends AbstractNpcAI { htmltext = "Roiental-NoLevel.html"; } - else if ((player.getClan() == null) || (player.getClan().getLevel() < CLAN_MIN_LVL_TA)) + else if (player.getClan() == null) + { + player.sendPacket(SystemMessageId.YOU_DO_NOT_BELONG_TO_ANY_CLAN); + } + else if ((player.getClan().getLevel() < CLAN_MIN_LVL_TA)) { htmltext = "Roiental-03c.html"; } - else if ((player.getClan() == null) || player.getClan().getVariables().hasVariable("TOH_DONE")) + else if (player.getClan().getVariables().hasVariable("TOH_DONE")) { htmltext = "Roiental-AlreadyDone.html"; } + else if (!player.hasClanPrivilege(ClanPrivilege.CL_THRONE_OF_HEROES)) + { + player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); + } else { htmltext = "Roiental-01c.html"; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index c3fc6493cd..7cd8fa2707 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -151,7 +151,7 @@ public class CastleChamberlain extends AbstractNpcAI private final String funcConfirmHtml(Player player, Npc npc, Castle castle, int func, int level) { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { final NpcHtmlMessage html; final String fstring = (func == Castle.FUNC_TELEPORT) ? "9" : "10"; @@ -461,7 +461,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "siege_functions": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { if (castle.getSiege().isInProgress()) { @@ -484,7 +484,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "manage_doors": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { if (st.hasMoreTokens()) { @@ -511,7 +511,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "upgrade_doors": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { final int type = Integer.parseInt(st.nextToken()); final int level = Integer.parseInt(st.nextToken()); @@ -528,7 +528,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "upgrade_doors_confirm": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { if (castle.getSiege().isInProgress()) { @@ -579,7 +579,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "manage_trap": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { if (st.hasMoreTokens()) { @@ -608,7 +608,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "upgrade_trap": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { final String trapIndex = st.nextToken(); final int level = Integer.parseInt(st.nextToken()); @@ -626,7 +626,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "upgrade_trap_confirm": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { if (castle.getSiege().isInProgress()) { @@ -688,7 +688,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "manage_vault": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_TAXES)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_TAXES)) { final NpcHtmlMessage html = getHtmlPacket(player, npc, "castlemanagevault.html"); html.replace("%tax_income%", Util.formatAdena(castle.getTreasury())); @@ -702,7 +702,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "manage_vault_deposit": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_TAXES)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_TAXES)) { final NpcHtmlMessage html = getHtmlPacket(player, npc, "castlemanagevault_deposit.html"); html.replace("%tax_income%", Util.formatAdena(castle.getTreasury())); @@ -716,7 +716,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "manage_vault_withdraw": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_TAXES)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_TAXES)) { final NpcHtmlMessage html = getHtmlPacket(player, npc, "castlemanagevault_withdraw.html"); html.replace("%tax_income%", Util.formatAdena(castle.getTreasury())); @@ -730,7 +730,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "deposit": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_TAXES)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_TAXES)) { final long amount = (st.hasMoreTokens()) ? Long.parseLong(st.nextToken()) : 0; if ((amount > 0) && (amount < Inventory.MAX_ADENA)) @@ -755,7 +755,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "withdraw": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_TAXES)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_TAXES)) { final long amount = (st.hasMoreTokens()) ? Long.parseLong(st.nextToken()) : 0; if (amount <= castle.getTreasury()) @@ -832,7 +832,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "doors": { - if (!isOwner(player, npc) || !player.hasClanPrivilege(ClanPrivilege.CS_OPEN_DOOR)) + if (!isOwner(player, npc) || !player.hasClanPrivilege(ClanPrivilege.CS_ENTRY_EXIT_RIGHTS)) { htmltext = "chamberlain-21.html"; } @@ -848,7 +848,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "operate_door": { - if (!isOwner(player, npc) || !player.hasClanPrivilege(ClanPrivilege.CS_OPEN_DOOR)) + if (!isOwner(player, npc) || !player.hasClanPrivilege(ClanPrivilege.CS_ENTRY_EXIT_RIGHTS)) { htmltext = "chamberlain-21.html"; } @@ -869,12 +869,12 @@ public class CastleChamberlain extends AbstractNpcAI } case "additional_functions": { - htmltext = (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) ? "castletdecomanage.html" : "chamberlain-21.html"; + htmltext = (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) ? "castletdecomanage.html" : "chamberlain-21.html"; break; } case "recovery": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { final NpcHtmlMessage html = getHtmlPacket(player, npc, "castledeco-AR01.html"); funcReplace(castle, html, Castle.FUNC_RESTORE_HP, "HP"); @@ -890,7 +890,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "other": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { final NpcHtmlMessage html = getHtmlPacket(player, npc, "castledeco-AE01.html"); funcReplace(castle, html, Castle.FUNC_TELEPORT, "TP"); @@ -935,7 +935,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "set_func": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { final int func = Integer.parseInt(st.nextToken()); final int level = Integer.parseInt(st.nextToken()); @@ -1081,7 +1081,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "list_siege_clans": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_SIEGE)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SIEGE_WAR)) { castle.getSiege().listRegisterClan(player); } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java index 3e2cd16930..8ca546336f 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java @@ -340,7 +340,7 @@ public class CastleCourtMagician extends AbstractNpcAI } case "squadSkill": { - if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_TROOPS_FAME)) + if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_SETTINGS)) { RequestAcquireSkill.showSubUnitSkillList(player); } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java index 7741cfc94b..c29a45aa5a 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java @@ -136,7 +136,7 @@ public class CastleDoorManager extends AbstractNpcAI @Override public String onFirstTalk(Npc npc, Player player) { - return isOwningClan(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_OPEN_DOOR) ? getHtmlName(npc) + ".html" : getHtmlName(npc) + "-no.html"; + return isOwningClan(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_ENTRY_EXIT_RIGHTS) ? getHtmlName(npc) + ".html" : getHtmlName(npc) + "-no.html"; } private String getHtmlName(Npc npc) diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java index 7fe2abc3d4..657fb09ed9 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java @@ -74,7 +74,7 @@ public class ClanHallDoorManager extends AbstractNpcAI } case "manageDoors": { - if (isOwningClan(player, npc) && st.hasMoreTokens() && player.hasClanPrivilege(ClanPrivilege.CH_OPEN_DOOR)) + if (isOwningClan(player, npc) && st.hasMoreTokens() && player.hasClanPrivilege(ClanPrivilege.CH_ENTRY_EXIT_RIGHTS)) { final boolean open = st.nextToken().equals("1"); clanHall.openCloseDoors(open); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java index a4f1493474..34d06948d8 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java @@ -134,7 +134,7 @@ public class ClanHallManager extends AbstractNpcAI } case "manageDoors": { - if (player.hasClanPrivilege(ClanPrivilege.CH_OPEN_DOOR)) + if (player.hasClanPrivilege(ClanPrivilege.CH_ENTRY_EXIT_RIGHTS)) { if (st.hasMoreTokens()) { @@ -175,7 +175,7 @@ public class ClanHallManager extends AbstractNpcAI } case "useFunctions": { - if (player.hasClanPrivilege(ClanPrivilege.CH_OTHER_RIGHTS)) + if (player.hasClanPrivilege(ClanPrivilege.CH_USE_FUNCTIONS)) { if (!st.hasMoreTokens()) { @@ -303,7 +303,7 @@ public class ClanHallManager extends AbstractNpcAI } case "manageFunctions": { - if (player.hasClanPrivilege(ClanPrivilege.CH_SET_FUNCTIONS)) + if (player.hasClanPrivilege(ClanPrivilege.CH_SETTTINGS)) { if (!st.hasMoreTokens()) { diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java index 1d8e114daa..c770d62950 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java @@ -111,7 +111,7 @@ public class ClanTrader extends AbstractNpcAI String htmltext = null; if (player.getClanId() > 0) { - htmltext = npc.getId() + ((player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_TROOPS_FAME)) ? ".html" : "-06.html"); + htmltext = npc.getId() + ((player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_SETTINGS)) ? ".html" : "-06.html"); } else { diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java index 79742f7171..1bb90fa8af 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java @@ -100,7 +100,7 @@ public class FortressSiegeManager extends AbstractNpcAI html.replace("%clanName%", fortress.getOwnerClan().getName()); return html.getHtml(); } - else if (!player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_SIEGE)) + else if (!player.hasClanPrivilege(ClanPrivilege.CS_SIEGE_WAR)) { htmltext = "FortressSiegeManager-10.html"; } @@ -169,7 +169,7 @@ public class FortressSiegeManager extends AbstractNpcAI html.replace("%clanName%", fortress.getOwnerClan().getName()); return html.getHtml(); } - else if (!player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_SIEGE)) + else if (!player.hasClanPrivilege(ClanPrivilege.CS_SIEGE_WAR)) { htmltext = "FortressSiegeManager-10.html"; } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java index ec177e537e..b491443c92 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java @@ -254,7 +254,7 @@ public class SupportUnitCaptain extends AbstractNpcAI } case "squadSkill": { - if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_TROOPS_FAME)) + if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_SETTINGS)) { RequestAcquireSkill.showSubUnitSkillList(player); } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index e7113941ec..8fa9547da4 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -80,7 +80,7 @@ public class ClanWarehouse implements IBypassHandler { player.sendPacket(ActionFailed.STATIC_PACKET); - if (!player.hasClanPrivilege(ClanPrivilege.CL_VIEW_WAREHOUSE)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_WAREHOUSE_SEARCH)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_RIGHT_TO_USE_THE_CLAN_WAREHOUSE); return true; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/vehicles/AirShipController.java index 231be2fffd..1c328d7a26 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/vehicles/AirShipController.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/vehicles/AirShipController.java @@ -134,7 +134,7 @@ public abstract class AirShipController extends AbstractNpcAI player.sendPacket(SystemMessageId.ANOTHER_AIRSHIP_HAS_BEEN_SUMMONED_TO_THE_WHARF_PLEASE_TRY_AGAIN_LATER); return null; } - if (!player.hasClanPrivilege(ClanPrivilege.CL_SUMMON_AIRSHIP)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_USE_FUNCTIONS)) { player.sendPacket(SystemMessageId.AIRSHIP_SUMMON_LICENSE_REGISTRATION_CAN_ONLY_BE_DONE_BY_THE_CLAN_LEADER); return null; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/FortManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/FortManager.java index 50bd50bf13..d0b36d8c93 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/FortManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/FortManager.java @@ -185,7 +185,7 @@ public class FortManager extends Merchant else if (actualCommand.equalsIgnoreCase("operate_door")) // door // control { - if (player.hasClanPrivilege(ClanPrivilege.CS_OPEN_DOOR)) + if (player.hasClanPrivilege(ClanPrivilege.CS_ENTRY_EXIT_RIGHTS)) { if (!val.isEmpty()) { @@ -230,7 +230,7 @@ public class FortManager extends Merchant else if (actualCommand.equalsIgnoreCase("manage_vault")) { final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); - if (player.hasClanPrivilege(ClanPrivilege.CL_VIEW_WAREHOUSE)) + if (player.hasClanPrivilege(ClanPrivilege.CL_WAREHOUSE_SEARCH)) { if (val.equalsIgnoreCase("deposit")) { @@ -320,7 +320,7 @@ public class FortManager extends Merchant } else if (actualCommand.equalsIgnoreCase("manage")) { - if (player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { if (val.equalsIgnoreCase("recovery")) { @@ -995,7 +995,7 @@ public class FortManager extends Merchant private void showVaultWindowWithdraw(Player player) { - if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_VIEW_WAREHOUSE)) + if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_WAREHOUSE_SEARCH)) { player.sendPacket(ActionFailed.STATIC_PACKET); player.setActiveWarehouse(player.getClan().getWarehouse()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/Clan.java index 58ad487175..803fcc0513 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -2040,7 +2040,7 @@ public class Clan implements IIdentifiable, INamable { return false; } - if (!player.hasClanPrivilege(ClanPrivilege.CL_JOIN_CLAN)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_INVITE)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/ClanPrivilege.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/ClanPrivilege.java index 29fc684cbf..7dfa83fcd1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/ClanPrivilege.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/ClanPrivilege.java @@ -25,35 +25,35 @@ public enum ClanPrivilege { /** dummy entry */ DUMMY, - /** Privilege to join clan */ - CL_JOIN_CLAN, - /** Privilege to give a title */ - CL_GIVE_TITLE, - /** Privilege to view warehouse content */ - CL_VIEW_WAREHOUSE, - /** Privilege to manage clan ranks */ + + /** System Privileges */ + CL_INVITE, + CL_MANAGE_TITLES, + CL_WAREHOUSE_SEARCH, CL_MANAGE_RANKS, - CL_PLEDGE_WAR, + CL_CLAN_WAR, CL_DISMISS, - /** Privilege to register clan crest */ - CL_REGISTER_CREST, - CL_APPRENTICE, - CL_TROOPS_FAME, - CL_SUMMON_AIRSHIP, - /** Privilege to open a door */ - CH_OPEN_DOOR, - CH_OTHER_RIGHTS, + CL_EDIT_CREST, + CL_USE_FUNCTIONS, + CL_SETTINGS, + CL_THRONE_OF_HEROES, + + /** Clan Hall Privileges */ + CH_ENTRY_EXIT_RIGHTS, + CH_USE_FUNCTIONS, CH_AUCTION, CH_DISMISS, - CH_SET_FUNCTIONS, - CS_OPEN_DOOR, - CS_MANOR_ADMIN, - CS_MANAGE_SIEGE, + CH_SETTTINGS, + + /** Castle/Fortress Privileges */ + CS_ENTRY_EXIT_RIGHTS, + CS_SIEGE_WAR, CS_USE_FUNCTIONS, + CS_SETTINGS, CS_DISMISS, - CS_TAXES, + CS_MANAGE_TAXES, CS_MERCENARIES, - CS_SET_FUNCTIONS; + CS_MANOR_ADMIN; public int getBitmask() { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index e37d90515e..cd8587f455 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -183,7 +183,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } case SUBPLEDGE: { - if (!player.isClanLeader() || !player.hasClanPrivilege(ClanPrivilege.CL_TROOPS_FAME)) + if (!player.isClanLeader() || !player.hasClanPrivilege(ClanPrivilege.CL_SETTINGS)) { return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 218e629395..c090be32fb 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -113,7 +113,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket } case SUBPLEDGE: { - if (!player.isClanLeader() || !player.hasClanPrivilege(ClanPrivilege.CL_TROOPS_FAME)) + if (!player.isClanLeader() || !player.hasClanPrivilege(ClanPrivilege.CL_SETTINGS)) { return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index af65e15cae..1437171c64 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -75,7 +75,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (!player.hasClanPrivilege(ClanPrivilege.CL_REGISTER_CREST)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_EDIT_CREST)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java index 9624152294..7d683a77f0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java @@ -55,7 +55,7 @@ public class RequestGiveNickName implements IClientIncomingPacket else { // Can the player change/give a title? - if (!player.hasClanPrivilege(ClanPrivilege.CL_GIVE_TITLE)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_MANAGE_TITLES)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index d4e22b4a84..1d254b8cc6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -52,7 +52,7 @@ public class RequestJoinSiege implements IClientIncomingPacket return; } - if (!player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_SIEGE)) + if (!player.hasClanPrivilege(ClanPrivilege.CS_SIEGE_WAR)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java index 464ad76c9f..cc7f14fdc1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java @@ -65,7 +65,7 @@ public class RequestPledgePower implements IClientIncomingPacket // Clan war, right to dismiss, set functions // Auction, manage taxes, attack/defend registration, mercenary management // => Leaves only CP_CL_VIEW_WAREHOUSE, CP_CH_OPEN_DOOR, CP_CS_OPEN_DOOR? - _privs &= ClanPrivilege.CL_VIEW_WAREHOUSE.getBitmask() | ClanPrivilege.CH_OPEN_DOOR.getBitmask() | ClanPrivilege.CS_OPEN_DOOR.getBitmask(); + _privs &= ClanPrivilege.CL_WAREHOUSE_SEARCH.getBitmask() | ClanPrivilege.CH_ENTRY_EXIT_RIGHTS.getBitmask() | ClanPrivilege.CS_ENTRY_EXIT_RIGHTS.getBitmask(); } player.getClan().setRankPrivs(_rank, _privs); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java index 223af2a1af..232fca08b6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java @@ -54,7 +54,7 @@ public class RequestPledgeSetAcademyMaster implements IClientIncomingPacket return; } - if (!player.hasClanPrivilege(ClanPrivilege.CL_APPRENTICE)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_DISMISS)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_RIGHT_TO_DISMISS_AN_APPRENTICE); return; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index b327d72320..c1e4553830 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -80,7 +80,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (!player.hasClanPrivilege(ClanPrivilege.CL_REGISTER_CREST)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_EDIT_CREST)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index c367a7a173..7c7acf5fc1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -63,7 +63,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR)) + else if (!player.hasClanPrivilege(ClanPrivilege.CL_CLAN_WAR)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java index 1d140aceb8..26d3e6fcc3 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java @@ -68,7 +68,7 @@ public class RequestStopPledgeWar implements IClientIncomingPacket } // Check if player who does the request has the correct rights to do it - if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_CLAN_WAR)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java index e8c4b1a0e1..2cde72010a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java @@ -72,7 +72,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR)) + else if (!player.hasClanPrivilege(ClanPrivilege.CL_CLAN_WAR)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 6a77cd50bc..f30885d92f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -103,7 +103,7 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket if (Config.ALT_MEMBERS_CAN_WITHDRAW_FROM_CLANWH) { - if ((warehouse instanceof ClanWarehouse) && !player.hasClanPrivilege(ClanPrivilege.CL_VIEW_WAREHOUSE)) + if ((warehouse instanceof ClanWarehouse) && !player.hasClanPrivilege(ClanPrivilege.CL_WAREHOUSE_SEARCH)) { return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java index 43c01dcd8b..eedcc75645 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java @@ -68,7 +68,7 @@ public class Nottingale extends AbstractNpcAI { if (player.getClan() != null) { - if (player.hasClanPrivilege(ClanPrivilege.CL_SUMMON_AIRSHIP) && AirShipManager.getInstance().hasAirShipLicense(player.getClanId()) && !AirShipManager.getInstance().hasAirShip(player.getClanId())) + if (player.hasClanPrivilege(ClanPrivilege.CL_USE_FUNCTIONS) && AirShipManager.getInstance().hasAirShipLicense(player.getClanId()) && !AirShipManager.getInstance().hasAirShip(player.getClanId())) { htmltext = event; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java index 77ea59eef5..e2a2dba97f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java @@ -19,7 +19,9 @@ package ai.areas.Rune.Roiental; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.network.SystemMessageId; import ai.AbstractNpcAI; @@ -57,14 +59,22 @@ public class Roiental extends AbstractNpcAI { htmltext = "Roiental-NoLevel.html"; } - else if ((player.getClan() == null) || (player.getClan().getLevel() < CLAN_MIN_LVL_GB)) + else if (player.getClan() == null) + { + player.sendPacket(SystemMessageId.YOU_DO_NOT_BELONG_TO_ANY_CLAN); + } + else if ((player.getClan().getLevel() < CLAN_MIN_LVL_GB)) { htmltext = "Roiental-03a.html"; } - else if ((player.getClan() == null) || player.getClan().getVariables().hasVariable("TOH_DONE")) + else if (player.getClan().getVariables().hasVariable("TOH_DONE")) { htmltext = "Roiental-AlreadyDone.html"; } + else if (!player.hasClanPrivilege(ClanPrivilege.CL_THRONE_OF_HEROES)) + { + player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); + } else { htmltext = "Roiental-01a.html"; @@ -76,14 +86,22 @@ public class Roiental extends AbstractNpcAI { htmltext = "Roiental-NoLevel.html"; } - else if ((player.getClan() == null) || (player.getClan().getLevel() < CLAN_MIN_LVL_MR)) + else if (player.getClan() == null) + { + player.sendPacket(SystemMessageId.YOU_DO_NOT_BELONG_TO_ANY_CLAN); + } + else if ((player.getClan().getLevel() < CLAN_MIN_LVL_MR)) { htmltext = "Roiental-03b.html"; } - else if ((player.getClan() == null) || player.getClan().getVariables().hasVariable("TOH_DONE")) + else if (player.getClan().getVariables().hasVariable("TOH_DONE")) { htmltext = "Roiental-AlreadyDone.html"; } + else if (!player.hasClanPrivilege(ClanPrivilege.CL_THRONE_OF_HEROES)) + { + player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); + } else { htmltext = "Roiental-01b.html"; @@ -95,14 +113,22 @@ public class Roiental extends AbstractNpcAI { htmltext = "Roiental-NoLevel.html"; } - else if ((player.getClan() == null) || (player.getClan().getLevel() < CLAN_MIN_LVL_TA)) + else if (player.getClan() == null) + { + player.sendPacket(SystemMessageId.YOU_DO_NOT_BELONG_TO_ANY_CLAN); + } + else if ((player.getClan().getLevel() < CLAN_MIN_LVL_TA)) { htmltext = "Roiental-03c.html"; } - else if ((player.getClan() == null) || player.getClan().getVariables().hasVariable("TOH_DONE")) + else if (player.getClan().getVariables().hasVariable("TOH_DONE")) { htmltext = "Roiental-AlreadyDone.html"; } + else if (!player.hasClanPrivilege(ClanPrivilege.CL_THRONE_OF_HEROES)) + { + player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); + } else { htmltext = "Roiental-01c.html"; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index c3fc6493cd..7cd8fa2707 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -151,7 +151,7 @@ public class CastleChamberlain extends AbstractNpcAI private final String funcConfirmHtml(Player player, Npc npc, Castle castle, int func, int level) { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { final NpcHtmlMessage html; final String fstring = (func == Castle.FUNC_TELEPORT) ? "9" : "10"; @@ -461,7 +461,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "siege_functions": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { if (castle.getSiege().isInProgress()) { @@ -484,7 +484,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "manage_doors": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { if (st.hasMoreTokens()) { @@ -511,7 +511,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "upgrade_doors": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { final int type = Integer.parseInt(st.nextToken()); final int level = Integer.parseInt(st.nextToken()); @@ -528,7 +528,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "upgrade_doors_confirm": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { if (castle.getSiege().isInProgress()) { @@ -579,7 +579,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "manage_trap": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { if (st.hasMoreTokens()) { @@ -608,7 +608,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "upgrade_trap": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { final String trapIndex = st.nextToken(); final int level = Integer.parseInt(st.nextToken()); @@ -626,7 +626,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "upgrade_trap_confirm": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { if (castle.getSiege().isInProgress()) { @@ -688,7 +688,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "manage_vault": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_TAXES)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_TAXES)) { final NpcHtmlMessage html = getHtmlPacket(player, npc, "castlemanagevault.html"); html.replace("%tax_income%", Util.formatAdena(castle.getTreasury())); @@ -702,7 +702,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "manage_vault_deposit": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_TAXES)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_TAXES)) { final NpcHtmlMessage html = getHtmlPacket(player, npc, "castlemanagevault_deposit.html"); html.replace("%tax_income%", Util.formatAdena(castle.getTreasury())); @@ -716,7 +716,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "manage_vault_withdraw": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_TAXES)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_TAXES)) { final NpcHtmlMessage html = getHtmlPacket(player, npc, "castlemanagevault_withdraw.html"); html.replace("%tax_income%", Util.formatAdena(castle.getTreasury())); @@ -730,7 +730,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "deposit": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_TAXES)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_TAXES)) { final long amount = (st.hasMoreTokens()) ? Long.parseLong(st.nextToken()) : 0; if ((amount > 0) && (amount < Inventory.MAX_ADENA)) @@ -755,7 +755,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "withdraw": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_TAXES)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_TAXES)) { final long amount = (st.hasMoreTokens()) ? Long.parseLong(st.nextToken()) : 0; if (amount <= castle.getTreasury()) @@ -832,7 +832,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "doors": { - if (!isOwner(player, npc) || !player.hasClanPrivilege(ClanPrivilege.CS_OPEN_DOOR)) + if (!isOwner(player, npc) || !player.hasClanPrivilege(ClanPrivilege.CS_ENTRY_EXIT_RIGHTS)) { htmltext = "chamberlain-21.html"; } @@ -848,7 +848,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "operate_door": { - if (!isOwner(player, npc) || !player.hasClanPrivilege(ClanPrivilege.CS_OPEN_DOOR)) + if (!isOwner(player, npc) || !player.hasClanPrivilege(ClanPrivilege.CS_ENTRY_EXIT_RIGHTS)) { htmltext = "chamberlain-21.html"; } @@ -869,12 +869,12 @@ public class CastleChamberlain extends AbstractNpcAI } case "additional_functions": { - htmltext = (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) ? "castletdecomanage.html" : "chamberlain-21.html"; + htmltext = (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) ? "castletdecomanage.html" : "chamberlain-21.html"; break; } case "recovery": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { final NpcHtmlMessage html = getHtmlPacket(player, npc, "castledeco-AR01.html"); funcReplace(castle, html, Castle.FUNC_RESTORE_HP, "HP"); @@ -890,7 +890,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "other": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { final NpcHtmlMessage html = getHtmlPacket(player, npc, "castledeco-AE01.html"); funcReplace(castle, html, Castle.FUNC_TELEPORT, "TP"); @@ -935,7 +935,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "set_func": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { final int func = Integer.parseInt(st.nextToken()); final int level = Integer.parseInt(st.nextToken()); @@ -1081,7 +1081,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "list_siege_clans": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_SIEGE)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SIEGE_WAR)) { castle.getSiege().listRegisterClan(player); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java index 3e2cd16930..8ca546336f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java @@ -340,7 +340,7 @@ public class CastleCourtMagician extends AbstractNpcAI } case "squadSkill": { - if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_TROOPS_FAME)) + if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_SETTINGS)) { RequestAcquireSkill.showSubUnitSkillList(player); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java index 7741cfc94b..c29a45aa5a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java @@ -136,7 +136,7 @@ public class CastleDoorManager extends AbstractNpcAI @Override public String onFirstTalk(Npc npc, Player player) { - return isOwningClan(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_OPEN_DOOR) ? getHtmlName(npc) + ".html" : getHtmlName(npc) + "-no.html"; + return isOwningClan(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_ENTRY_EXIT_RIGHTS) ? getHtmlName(npc) + ".html" : getHtmlName(npc) + "-no.html"; } private String getHtmlName(Npc npc) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java index 7fe2abc3d4..657fb09ed9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java @@ -74,7 +74,7 @@ public class ClanHallDoorManager extends AbstractNpcAI } case "manageDoors": { - if (isOwningClan(player, npc) && st.hasMoreTokens() && player.hasClanPrivilege(ClanPrivilege.CH_OPEN_DOOR)) + if (isOwningClan(player, npc) && st.hasMoreTokens() && player.hasClanPrivilege(ClanPrivilege.CH_ENTRY_EXIT_RIGHTS)) { final boolean open = st.nextToken().equals("1"); clanHall.openCloseDoors(open); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java index a4f1493474..34d06948d8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java @@ -134,7 +134,7 @@ public class ClanHallManager extends AbstractNpcAI } case "manageDoors": { - if (player.hasClanPrivilege(ClanPrivilege.CH_OPEN_DOOR)) + if (player.hasClanPrivilege(ClanPrivilege.CH_ENTRY_EXIT_RIGHTS)) { if (st.hasMoreTokens()) { @@ -175,7 +175,7 @@ public class ClanHallManager extends AbstractNpcAI } case "useFunctions": { - if (player.hasClanPrivilege(ClanPrivilege.CH_OTHER_RIGHTS)) + if (player.hasClanPrivilege(ClanPrivilege.CH_USE_FUNCTIONS)) { if (!st.hasMoreTokens()) { @@ -303,7 +303,7 @@ public class ClanHallManager extends AbstractNpcAI } case "manageFunctions": { - if (player.hasClanPrivilege(ClanPrivilege.CH_SET_FUNCTIONS)) + if (player.hasClanPrivilege(ClanPrivilege.CH_SETTTINGS)) { if (!st.hasMoreTokens()) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java index 79742f7171..1bb90fa8af 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java @@ -100,7 +100,7 @@ public class FortressSiegeManager extends AbstractNpcAI html.replace("%clanName%", fortress.getOwnerClan().getName()); return html.getHtml(); } - else if (!player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_SIEGE)) + else if (!player.hasClanPrivilege(ClanPrivilege.CS_SIEGE_WAR)) { htmltext = "FortressSiegeManager-10.html"; } @@ -169,7 +169,7 @@ public class FortressSiegeManager extends AbstractNpcAI html.replace("%clanName%", fortress.getOwnerClan().getName()); return html.getHtml(); } - else if (!player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_SIEGE)) + else if (!player.hasClanPrivilege(ClanPrivilege.CS_SIEGE_WAR)) { htmltext = "FortressSiegeManager-10.html"; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java index ec177e537e..b491443c92 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java @@ -254,7 +254,7 @@ public class SupportUnitCaptain extends AbstractNpcAI } case "squadSkill": { - if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_TROOPS_FAME)) + if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_SETTINGS)) { RequestAcquireSkill.showSubUnitSkillList(player); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index e7113941ec..8fa9547da4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -80,7 +80,7 @@ public class ClanWarehouse implements IBypassHandler { player.sendPacket(ActionFailed.STATIC_PACKET); - if (!player.hasClanPrivilege(ClanPrivilege.CL_VIEW_WAREHOUSE)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_WAREHOUSE_SEARCH)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_RIGHT_TO_USE_THE_CLAN_WAREHOUSE); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/vehicles/AirShipController.java index 231be2fffd..1c328d7a26 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/vehicles/AirShipController.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/vehicles/AirShipController.java @@ -134,7 +134,7 @@ public abstract class AirShipController extends AbstractNpcAI player.sendPacket(SystemMessageId.ANOTHER_AIRSHIP_HAS_BEEN_SUMMONED_TO_THE_WHARF_PLEASE_TRY_AGAIN_LATER); return null; } - if (!player.hasClanPrivilege(ClanPrivilege.CL_SUMMON_AIRSHIP)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_USE_FUNCTIONS)) { player.sendPacket(SystemMessageId.AIRSHIP_SUMMON_LICENSE_REGISTRATION_CAN_ONLY_BE_DONE_BY_THE_CLAN_LEADER); return null; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/FortManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/FortManager.java index 50bd50bf13..d0b36d8c93 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/FortManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/FortManager.java @@ -185,7 +185,7 @@ public class FortManager extends Merchant else if (actualCommand.equalsIgnoreCase("operate_door")) // door // control { - if (player.hasClanPrivilege(ClanPrivilege.CS_OPEN_DOOR)) + if (player.hasClanPrivilege(ClanPrivilege.CS_ENTRY_EXIT_RIGHTS)) { if (!val.isEmpty()) { @@ -230,7 +230,7 @@ public class FortManager extends Merchant else if (actualCommand.equalsIgnoreCase("manage_vault")) { final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); - if (player.hasClanPrivilege(ClanPrivilege.CL_VIEW_WAREHOUSE)) + if (player.hasClanPrivilege(ClanPrivilege.CL_WAREHOUSE_SEARCH)) { if (val.equalsIgnoreCase("deposit")) { @@ -320,7 +320,7 @@ public class FortManager extends Merchant } else if (actualCommand.equalsIgnoreCase("manage")) { - if (player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { if (val.equalsIgnoreCase("recovery")) { @@ -995,7 +995,7 @@ public class FortManager extends Merchant private void showVaultWindowWithdraw(Player player) { - if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_VIEW_WAREHOUSE)) + if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_WAREHOUSE_SEARCH)) { player.sendPacket(ActionFailed.STATIC_PACKET); player.setActiveWarehouse(player.getClan().getWarehouse()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/Clan.java index 58ad487175..803fcc0513 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -2040,7 +2040,7 @@ public class Clan implements IIdentifiable, INamable { return false; } - if (!player.hasClanPrivilege(ClanPrivilege.CL_JOIN_CLAN)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_INVITE)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/ClanPrivilege.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/ClanPrivilege.java index 29fc684cbf..7dfa83fcd1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/ClanPrivilege.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/ClanPrivilege.java @@ -25,35 +25,35 @@ public enum ClanPrivilege { /** dummy entry */ DUMMY, - /** Privilege to join clan */ - CL_JOIN_CLAN, - /** Privilege to give a title */ - CL_GIVE_TITLE, - /** Privilege to view warehouse content */ - CL_VIEW_WAREHOUSE, - /** Privilege to manage clan ranks */ + + /** System Privileges */ + CL_INVITE, + CL_MANAGE_TITLES, + CL_WAREHOUSE_SEARCH, CL_MANAGE_RANKS, - CL_PLEDGE_WAR, + CL_CLAN_WAR, CL_DISMISS, - /** Privilege to register clan crest */ - CL_REGISTER_CREST, - CL_APPRENTICE, - CL_TROOPS_FAME, - CL_SUMMON_AIRSHIP, - /** Privilege to open a door */ - CH_OPEN_DOOR, - CH_OTHER_RIGHTS, + CL_EDIT_CREST, + CL_USE_FUNCTIONS, + CL_SETTINGS, + CL_THRONE_OF_HEROES, + + /** Clan Hall Privileges */ + CH_ENTRY_EXIT_RIGHTS, + CH_USE_FUNCTIONS, CH_AUCTION, CH_DISMISS, - CH_SET_FUNCTIONS, - CS_OPEN_DOOR, - CS_MANOR_ADMIN, - CS_MANAGE_SIEGE, + CH_SETTTINGS, + + /** Castle/Fortress Privileges */ + CS_ENTRY_EXIT_RIGHTS, + CS_SIEGE_WAR, CS_USE_FUNCTIONS, + CS_SETTINGS, CS_DISMISS, - CS_TAXES, + CS_MANAGE_TAXES, CS_MERCENARIES, - CS_SET_FUNCTIONS; + CS_MANOR_ADMIN; public int getBitmask() { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index e37d90515e..cd8587f455 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -183,7 +183,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } case SUBPLEDGE: { - if (!player.isClanLeader() || !player.hasClanPrivilege(ClanPrivilege.CL_TROOPS_FAME)) + if (!player.isClanLeader() || !player.hasClanPrivilege(ClanPrivilege.CL_SETTINGS)) { return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 218e629395..c090be32fb 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -113,7 +113,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket } case SUBPLEDGE: { - if (!player.isClanLeader() || !player.hasClanPrivilege(ClanPrivilege.CL_TROOPS_FAME)) + if (!player.isClanLeader() || !player.hasClanPrivilege(ClanPrivilege.CL_SETTINGS)) { return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index af65e15cae..1437171c64 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -75,7 +75,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (!player.hasClanPrivilege(ClanPrivilege.CL_REGISTER_CREST)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_EDIT_CREST)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java index 9624152294..7d683a77f0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java @@ -55,7 +55,7 @@ public class RequestGiveNickName implements IClientIncomingPacket else { // Can the player change/give a title? - if (!player.hasClanPrivilege(ClanPrivilege.CL_GIVE_TITLE)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_MANAGE_TITLES)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index d4e22b4a84..1d254b8cc6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -52,7 +52,7 @@ public class RequestJoinSiege implements IClientIncomingPacket return; } - if (!player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_SIEGE)) + if (!player.hasClanPrivilege(ClanPrivilege.CS_SIEGE_WAR)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java index 464ad76c9f..cc7f14fdc1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java @@ -65,7 +65,7 @@ public class RequestPledgePower implements IClientIncomingPacket // Clan war, right to dismiss, set functions // Auction, manage taxes, attack/defend registration, mercenary management // => Leaves only CP_CL_VIEW_WAREHOUSE, CP_CH_OPEN_DOOR, CP_CS_OPEN_DOOR? - _privs &= ClanPrivilege.CL_VIEW_WAREHOUSE.getBitmask() | ClanPrivilege.CH_OPEN_DOOR.getBitmask() | ClanPrivilege.CS_OPEN_DOOR.getBitmask(); + _privs &= ClanPrivilege.CL_WAREHOUSE_SEARCH.getBitmask() | ClanPrivilege.CH_ENTRY_EXIT_RIGHTS.getBitmask() | ClanPrivilege.CS_ENTRY_EXIT_RIGHTS.getBitmask(); } player.getClan().setRankPrivs(_rank, _privs); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java index 223af2a1af..232fca08b6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java @@ -54,7 +54,7 @@ public class RequestPledgeSetAcademyMaster implements IClientIncomingPacket return; } - if (!player.hasClanPrivilege(ClanPrivilege.CL_APPRENTICE)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_DISMISS)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_RIGHT_TO_DISMISS_AN_APPRENTICE); return; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index b327d72320..c1e4553830 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -80,7 +80,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (!player.hasClanPrivilege(ClanPrivilege.CL_REGISTER_CREST)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_EDIT_CREST)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index c367a7a173..7c7acf5fc1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -63,7 +63,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR)) + else if (!player.hasClanPrivilege(ClanPrivilege.CL_CLAN_WAR)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java index 1d140aceb8..26d3e6fcc3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java @@ -68,7 +68,7 @@ public class RequestStopPledgeWar implements IClientIncomingPacket } // Check if player who does the request has the correct rights to do it - if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_CLAN_WAR)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java index e8c4b1a0e1..2cde72010a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java @@ -72,7 +72,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR)) + else if (!player.hasClanPrivilege(ClanPrivilege.CL_CLAN_WAR)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 6a77cd50bc..f30885d92f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -103,7 +103,7 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket if (Config.ALT_MEMBERS_CAN_WITHDRAW_FROM_CLANWH) { - if ((warehouse instanceof ClanWarehouse) && !player.hasClanPrivilege(ClanPrivilege.CL_VIEW_WAREHOUSE)) + if ((warehouse instanceof ClanWarehouse) && !player.hasClanPrivilege(ClanPrivilege.CL_WAREHOUSE_SEARCH)) { return; } diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java index 43c01dcd8b..eedcc75645 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java @@ -68,7 +68,7 @@ public class Nottingale extends AbstractNpcAI { if (player.getClan() != null) { - if (player.hasClanPrivilege(ClanPrivilege.CL_SUMMON_AIRSHIP) && AirShipManager.getInstance().hasAirShipLicense(player.getClanId()) && !AirShipManager.getInstance().hasAirShip(player.getClanId())) + if (player.hasClanPrivilege(ClanPrivilege.CL_USE_FUNCTIONS) && AirShipManager.getInstance().hasAirShipLicense(player.getClanId()) && !AirShipManager.getInstance().hasAirShip(player.getClanId())) { htmltext = event; } diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java index 77ea59eef5..e2a2dba97f 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java @@ -19,7 +19,9 @@ package ai.areas.Rune.Roiental; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.network.SystemMessageId; import ai.AbstractNpcAI; @@ -57,14 +59,22 @@ public class Roiental extends AbstractNpcAI { htmltext = "Roiental-NoLevel.html"; } - else if ((player.getClan() == null) || (player.getClan().getLevel() < CLAN_MIN_LVL_GB)) + else if (player.getClan() == null) + { + player.sendPacket(SystemMessageId.YOU_DO_NOT_BELONG_TO_ANY_CLAN); + } + else if ((player.getClan().getLevel() < CLAN_MIN_LVL_GB)) { htmltext = "Roiental-03a.html"; } - else if ((player.getClan() == null) || player.getClan().getVariables().hasVariable("TOH_DONE")) + else if (player.getClan().getVariables().hasVariable("TOH_DONE")) { htmltext = "Roiental-AlreadyDone.html"; } + else if (!player.hasClanPrivilege(ClanPrivilege.CL_THRONE_OF_HEROES)) + { + player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); + } else { htmltext = "Roiental-01a.html"; @@ -76,14 +86,22 @@ public class Roiental extends AbstractNpcAI { htmltext = "Roiental-NoLevel.html"; } - else if ((player.getClan() == null) || (player.getClan().getLevel() < CLAN_MIN_LVL_MR)) + else if (player.getClan() == null) + { + player.sendPacket(SystemMessageId.YOU_DO_NOT_BELONG_TO_ANY_CLAN); + } + else if ((player.getClan().getLevel() < CLAN_MIN_LVL_MR)) { htmltext = "Roiental-03b.html"; } - else if ((player.getClan() == null) || player.getClan().getVariables().hasVariable("TOH_DONE")) + else if (player.getClan().getVariables().hasVariable("TOH_DONE")) { htmltext = "Roiental-AlreadyDone.html"; } + else if (!player.hasClanPrivilege(ClanPrivilege.CL_THRONE_OF_HEROES)) + { + player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); + } else { htmltext = "Roiental-01b.html"; @@ -95,14 +113,22 @@ public class Roiental extends AbstractNpcAI { htmltext = "Roiental-NoLevel.html"; } - else if ((player.getClan() == null) || (player.getClan().getLevel() < CLAN_MIN_LVL_TA)) + else if (player.getClan() == null) + { + player.sendPacket(SystemMessageId.YOU_DO_NOT_BELONG_TO_ANY_CLAN); + } + else if ((player.getClan().getLevel() < CLAN_MIN_LVL_TA)) { htmltext = "Roiental-03c.html"; } - else if ((player.getClan() == null) || player.getClan().getVariables().hasVariable("TOH_DONE")) + else if (player.getClan().getVariables().hasVariable("TOH_DONE")) { htmltext = "Roiental-AlreadyDone.html"; } + else if (!player.hasClanPrivilege(ClanPrivilege.CL_THRONE_OF_HEROES)) + { + player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); + } else { htmltext = "Roiental-01c.html"; diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 9f671f383a..29ebda96fb 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -151,7 +151,7 @@ public class CastleChamberlain extends AbstractNpcAI private final String funcConfirmHtml(Player player, Npc npc, Castle castle, int func, int level) { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { final NpcHtmlMessage html; final String fstring = (func == Castle.FUNC_TELEPORT) ? "9" : "10"; @@ -461,7 +461,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "siege_functions": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { if (castle.getSiege().isInProgress()) { @@ -484,7 +484,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "manage_doors": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { if (st.hasMoreTokens()) { @@ -511,7 +511,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "upgrade_doors": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { final int type = Integer.parseInt(st.nextToken()); final int level = Integer.parseInt(st.nextToken()); @@ -528,7 +528,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "upgrade_doors_confirm": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { if (castle.getSiege().isInProgress()) { @@ -579,7 +579,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "manage_trap": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { if (st.hasMoreTokens()) { @@ -608,7 +608,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "upgrade_trap": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { final String trapIndex = st.nextToken(); final int level = Integer.parseInt(st.nextToken()); @@ -626,7 +626,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "upgrade_trap_confirm": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { if (castle.getSiege().isInProgress()) { @@ -688,7 +688,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "manage_vault": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_TAXES)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_TAXES)) { final NpcHtmlMessage html = getHtmlPacket(player, npc, "castlemanagevault.html"); html.replace("%tax_income%", Util.formatAdena(castle.getTreasury())); @@ -702,7 +702,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "manage_vault_deposit": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_TAXES)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_TAXES)) { final NpcHtmlMessage html = getHtmlPacket(player, npc, "castlemanagevault_deposit.html"); html.replace("%tax_income%", Util.formatAdena(castle.getTreasury())); @@ -716,7 +716,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "manage_vault_withdraw": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_TAXES)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_TAXES)) { final NpcHtmlMessage html = getHtmlPacket(player, npc, "castlemanagevault_withdraw.html"); html.replace("%tax_income%", Util.formatAdena(castle.getTreasury())); @@ -730,7 +730,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "deposit": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_TAXES)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_TAXES)) { final long amount = (st.hasMoreTokens()) ? Long.parseLong(st.nextToken()) : 0; if ((amount > 0) && (amount < Inventory.MAX_ADENA)) @@ -755,7 +755,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "withdraw": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_TAXES)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_TAXES)) { final long amount = (st.hasMoreTokens()) ? Long.parseLong(st.nextToken()) : 0; if (amount <= castle.getTreasury()) @@ -832,7 +832,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "doors": { - if (!isOwner(player, npc) || !player.hasClanPrivilege(ClanPrivilege.CS_OPEN_DOOR)) + if (!isOwner(player, npc) || !player.hasClanPrivilege(ClanPrivilege.CS_ENTRY_EXIT_RIGHTS)) { htmltext = "chamberlain-21.html"; } @@ -848,7 +848,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "operate_door": { - if (!isOwner(player, npc) || !player.hasClanPrivilege(ClanPrivilege.CS_OPEN_DOOR)) + if (!isOwner(player, npc) || !player.hasClanPrivilege(ClanPrivilege.CS_ENTRY_EXIT_RIGHTS)) { htmltext = "chamberlain-21.html"; } @@ -869,12 +869,12 @@ public class CastleChamberlain extends AbstractNpcAI } case "additional_functions": { - htmltext = (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) ? "castletdecomanage.html" : "chamberlain-21.html"; + htmltext = (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) ? "castletdecomanage.html" : "chamberlain-21.html"; break; } case "recovery": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { final NpcHtmlMessage html = getHtmlPacket(player, npc, "castledeco-AR01.html"); funcReplace(castle, html, Castle.FUNC_RESTORE_HP, "HP"); @@ -890,7 +890,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "other": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { final NpcHtmlMessage html = getHtmlPacket(player, npc, "castledeco-AE01.html"); funcReplace(castle, html, Castle.FUNC_TELEPORT, "TP"); @@ -935,7 +935,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "set_func": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { final int func = Integer.parseInt(st.nextToken()); final int level = Integer.parseInt(st.nextToken()); @@ -1081,7 +1081,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "list_siege_clans": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_SIEGE)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SIEGE_WAR)) { castle.getSiege().listRegisterClan(player); } diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java index 3e2cd16930..8ca546336f 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java @@ -340,7 +340,7 @@ public class CastleCourtMagician extends AbstractNpcAI } case "squadSkill": { - if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_TROOPS_FAME)) + if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_SETTINGS)) { RequestAcquireSkill.showSubUnitSkillList(player); } diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java index 7741cfc94b..c29a45aa5a 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java @@ -136,7 +136,7 @@ public class CastleDoorManager extends AbstractNpcAI @Override public String onFirstTalk(Npc npc, Player player) { - return isOwningClan(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_OPEN_DOOR) ? getHtmlName(npc) + ".html" : getHtmlName(npc) + "-no.html"; + return isOwningClan(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_ENTRY_EXIT_RIGHTS) ? getHtmlName(npc) + ".html" : getHtmlName(npc) + "-no.html"; } private String getHtmlName(Npc npc) diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java index 7fe2abc3d4..657fb09ed9 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java @@ -74,7 +74,7 @@ public class ClanHallDoorManager extends AbstractNpcAI } case "manageDoors": { - if (isOwningClan(player, npc) && st.hasMoreTokens() && player.hasClanPrivilege(ClanPrivilege.CH_OPEN_DOOR)) + if (isOwningClan(player, npc) && st.hasMoreTokens() && player.hasClanPrivilege(ClanPrivilege.CH_ENTRY_EXIT_RIGHTS)) { final boolean open = st.nextToken().equals("1"); clanHall.openCloseDoors(open); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java index 9d4ff018f1..d0e89269ea 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java @@ -134,7 +134,7 @@ public class ClanHallManager extends AbstractNpcAI } case "manageDoors": { - if (player.hasClanPrivilege(ClanPrivilege.CH_OPEN_DOOR)) + if (player.hasClanPrivilege(ClanPrivilege.CH_ENTRY_EXIT_RIGHTS)) { if (st.hasMoreTokens()) { @@ -175,7 +175,7 @@ public class ClanHallManager extends AbstractNpcAI } case "useFunctions": { - if (player.hasClanPrivilege(ClanPrivilege.CH_OTHER_RIGHTS)) + if (player.hasClanPrivilege(ClanPrivilege.CH_USE_FUNCTIONS)) { if (!st.hasMoreTokens()) { @@ -303,7 +303,7 @@ public class ClanHallManager extends AbstractNpcAI } case "manageFunctions": { - if (player.hasClanPrivilege(ClanPrivilege.CH_SET_FUNCTIONS)) + if (player.hasClanPrivilege(ClanPrivilege.CH_SETTTINGS)) { if (!st.hasMoreTokens()) { diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java index 79742f7171..1bb90fa8af 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java @@ -100,7 +100,7 @@ public class FortressSiegeManager extends AbstractNpcAI html.replace("%clanName%", fortress.getOwnerClan().getName()); return html.getHtml(); } - else if (!player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_SIEGE)) + else if (!player.hasClanPrivilege(ClanPrivilege.CS_SIEGE_WAR)) { htmltext = "FortressSiegeManager-10.html"; } @@ -169,7 +169,7 @@ public class FortressSiegeManager extends AbstractNpcAI html.replace("%clanName%", fortress.getOwnerClan().getName()); return html.getHtml(); } - else if (!player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_SIEGE)) + else if (!player.hasClanPrivilege(ClanPrivilege.CS_SIEGE_WAR)) { htmltext = "FortressSiegeManager-10.html"; } diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java index ec177e537e..b491443c92 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java @@ -254,7 +254,7 @@ public class SupportUnitCaptain extends AbstractNpcAI } case "squadSkill": { - if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_TROOPS_FAME)) + if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_SETTINGS)) { RequestAcquireSkill.showSubUnitSkillList(player); } diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index e7113941ec..8fa9547da4 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -80,7 +80,7 @@ public class ClanWarehouse implements IBypassHandler { player.sendPacket(ActionFailed.STATIC_PACKET); - if (!player.hasClanPrivilege(ClanPrivilege.CL_VIEW_WAREHOUSE)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_WAREHOUSE_SEARCH)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_RIGHT_TO_USE_THE_CLAN_WAREHOUSE); return true; diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/vehicles/AirShipController.java index 231be2fffd..1c328d7a26 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/vehicles/AirShipController.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/vehicles/AirShipController.java @@ -134,7 +134,7 @@ public abstract class AirShipController extends AbstractNpcAI player.sendPacket(SystemMessageId.ANOTHER_AIRSHIP_HAS_BEEN_SUMMONED_TO_THE_WHARF_PLEASE_TRY_AGAIN_LATER); return null; } - if (!player.hasClanPrivilege(ClanPrivilege.CL_SUMMON_AIRSHIP)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_USE_FUNCTIONS)) { player.sendPacket(SystemMessageId.AIRSHIP_SUMMON_LICENSE_REGISTRATION_CAN_ONLY_BE_DONE_BY_THE_CLAN_LEADER); return null; diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/FortManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/FortManager.java index 50bd50bf13..d0b36d8c93 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/FortManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/FortManager.java @@ -185,7 +185,7 @@ public class FortManager extends Merchant else if (actualCommand.equalsIgnoreCase("operate_door")) // door // control { - if (player.hasClanPrivilege(ClanPrivilege.CS_OPEN_DOOR)) + if (player.hasClanPrivilege(ClanPrivilege.CS_ENTRY_EXIT_RIGHTS)) { if (!val.isEmpty()) { @@ -230,7 +230,7 @@ public class FortManager extends Merchant else if (actualCommand.equalsIgnoreCase("manage_vault")) { final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); - if (player.hasClanPrivilege(ClanPrivilege.CL_VIEW_WAREHOUSE)) + if (player.hasClanPrivilege(ClanPrivilege.CL_WAREHOUSE_SEARCH)) { if (val.equalsIgnoreCase("deposit")) { @@ -320,7 +320,7 @@ public class FortManager extends Merchant } else if (actualCommand.equalsIgnoreCase("manage")) { - if (player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { if (val.equalsIgnoreCase("recovery")) { @@ -995,7 +995,7 @@ public class FortManager extends Merchant private void showVaultWindowWithdraw(Player player) { - if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_VIEW_WAREHOUSE)) + if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_WAREHOUSE_SEARCH)) { player.sendPacket(ActionFailed.STATIC_PACKET); player.setActiveWarehouse(player.getClan().getWarehouse()); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java index 13e37f6352..3b7fd3469a 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -2040,7 +2040,7 @@ public class Clan implements IIdentifiable, INamable { return false; } - if (!player.hasClanPrivilege(ClanPrivilege.CL_JOIN_CLAN)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_INVITE)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanPrivilege.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanPrivilege.java index 29fc684cbf..7dfa83fcd1 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanPrivilege.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanPrivilege.java @@ -25,35 +25,35 @@ public enum ClanPrivilege { /** dummy entry */ DUMMY, - /** Privilege to join clan */ - CL_JOIN_CLAN, - /** Privilege to give a title */ - CL_GIVE_TITLE, - /** Privilege to view warehouse content */ - CL_VIEW_WAREHOUSE, - /** Privilege to manage clan ranks */ + + /** System Privileges */ + CL_INVITE, + CL_MANAGE_TITLES, + CL_WAREHOUSE_SEARCH, CL_MANAGE_RANKS, - CL_PLEDGE_WAR, + CL_CLAN_WAR, CL_DISMISS, - /** Privilege to register clan crest */ - CL_REGISTER_CREST, - CL_APPRENTICE, - CL_TROOPS_FAME, - CL_SUMMON_AIRSHIP, - /** Privilege to open a door */ - CH_OPEN_DOOR, - CH_OTHER_RIGHTS, + CL_EDIT_CREST, + CL_USE_FUNCTIONS, + CL_SETTINGS, + CL_THRONE_OF_HEROES, + + /** Clan Hall Privileges */ + CH_ENTRY_EXIT_RIGHTS, + CH_USE_FUNCTIONS, CH_AUCTION, CH_DISMISS, - CH_SET_FUNCTIONS, - CS_OPEN_DOOR, - CS_MANOR_ADMIN, - CS_MANAGE_SIEGE, + CH_SETTTINGS, + + /** Castle/Fortress Privileges */ + CS_ENTRY_EXIT_RIGHTS, + CS_SIEGE_WAR, CS_USE_FUNCTIONS, + CS_SETTINGS, CS_DISMISS, - CS_TAXES, + CS_MANAGE_TAXES, CS_MERCENARIES, - CS_SET_FUNCTIONS; + CS_MANOR_ADMIN; public int getBitmask() { diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index 4b7c0c623f..c95761c56c 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -183,7 +183,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } case SUBPLEDGE: { - if (!player.isClanLeader() || !player.hasClanPrivilege(ClanPrivilege.CL_TROOPS_FAME)) + if (!player.isClanLeader() || !player.hasClanPrivilege(ClanPrivilege.CL_SETTINGS)) { return; } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 218e629395..c090be32fb 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -113,7 +113,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket } case SUBPLEDGE: { - if (!player.isClanLeader() || !player.hasClanPrivilege(ClanPrivilege.CL_TROOPS_FAME)) + if (!player.isClanLeader() || !player.hasClanPrivilege(ClanPrivilege.CL_SETTINGS)) { return; } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index af65e15cae..1437171c64 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -75,7 +75,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (!player.hasClanPrivilege(ClanPrivilege.CL_REGISTER_CREST)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_EDIT_CREST)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return; diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java index 9624152294..7d683a77f0 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java @@ -55,7 +55,7 @@ public class RequestGiveNickName implements IClientIncomingPacket else { // Can the player change/give a title? - if (!player.hasClanPrivilege(ClanPrivilege.CL_GIVE_TITLE)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_MANAGE_TITLES)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return; diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index d4e22b4a84..1d254b8cc6 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -52,7 +52,7 @@ public class RequestJoinSiege implements IClientIncomingPacket return; } - if (!player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_SIEGE)) + if (!player.hasClanPrivilege(ClanPrivilege.CS_SIEGE_WAR)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return; diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java index 464ad76c9f..cc7f14fdc1 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java @@ -65,7 +65,7 @@ public class RequestPledgePower implements IClientIncomingPacket // Clan war, right to dismiss, set functions // Auction, manage taxes, attack/defend registration, mercenary management // => Leaves only CP_CL_VIEW_WAREHOUSE, CP_CH_OPEN_DOOR, CP_CS_OPEN_DOOR? - _privs &= ClanPrivilege.CL_VIEW_WAREHOUSE.getBitmask() | ClanPrivilege.CH_OPEN_DOOR.getBitmask() | ClanPrivilege.CS_OPEN_DOOR.getBitmask(); + _privs &= ClanPrivilege.CL_WAREHOUSE_SEARCH.getBitmask() | ClanPrivilege.CH_ENTRY_EXIT_RIGHTS.getBitmask() | ClanPrivilege.CS_ENTRY_EXIT_RIGHTS.getBitmask(); } player.getClan().setRankPrivs(_rank, _privs); } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java index c6cab61026..2828377897 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java @@ -54,7 +54,7 @@ public class RequestPledgeSetAcademyMaster implements IClientIncomingPacket return; } - if (!player.hasClanPrivilege(ClanPrivilege.CL_APPRENTICE)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_DISMISS)) { player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_THE_RIGHT_TO_DISMISS_MENTEES); return; diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index b327d72320..c1e4553830 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -80,7 +80,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (!player.hasClanPrivilege(ClanPrivilege.CL_REGISTER_CREST)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_EDIT_CREST)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return; diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index c367a7a173..7c7acf5fc1 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -63,7 +63,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR)) + else if (!player.hasClanPrivilege(ClanPrivilege.CL_CLAN_WAR)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java index f9bf7da766..dd26e852b5 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java @@ -69,7 +69,7 @@ public class RequestStopPledgeWar implements IClientIncomingPacket } // Check if player who does the request has the correct rights to do it - if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_CLAN_WAR)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return; diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java index 1a642e3f4a..b582d59d5d 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java @@ -72,7 +72,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR)) + else if (!player.hasClanPrivilege(ClanPrivilege.CL_CLAN_WAR)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 7f8843c3a1..4c23067767 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -103,7 +103,7 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket if (Config.ALT_MEMBERS_CAN_WITHDRAW_FROM_CLANWH) { - if ((warehouse instanceof ClanWarehouse) && !player.hasClanPrivilege(ClanPrivilege.CL_VIEW_WAREHOUSE)) + if ((warehouse instanceof ClanWarehouse) && !player.hasClanPrivilege(ClanPrivilege.CL_WAREHOUSE_SEARCH)) { return; } diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java index 43c01dcd8b..eedcc75645 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java @@ -68,7 +68,7 @@ public class Nottingale extends AbstractNpcAI { if (player.getClan() != null) { - if (player.hasClanPrivilege(ClanPrivilege.CL_SUMMON_AIRSHIP) && AirShipManager.getInstance().hasAirShipLicense(player.getClanId()) && !AirShipManager.getInstance().hasAirShip(player.getClanId())) + if (player.hasClanPrivilege(ClanPrivilege.CL_USE_FUNCTIONS) && AirShipManager.getInstance().hasAirShipLicense(player.getClanId()) && !AirShipManager.getInstance().hasAirShip(player.getClanId())) { htmltext = event; } diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java index 77ea59eef5..e2a2dba97f 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java @@ -19,7 +19,9 @@ package ai.areas.Rune.Roiental; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.network.SystemMessageId; import ai.AbstractNpcAI; @@ -57,14 +59,22 @@ public class Roiental extends AbstractNpcAI { htmltext = "Roiental-NoLevel.html"; } - else if ((player.getClan() == null) || (player.getClan().getLevel() < CLAN_MIN_LVL_GB)) + else if (player.getClan() == null) + { + player.sendPacket(SystemMessageId.YOU_DO_NOT_BELONG_TO_ANY_CLAN); + } + else if ((player.getClan().getLevel() < CLAN_MIN_LVL_GB)) { htmltext = "Roiental-03a.html"; } - else if ((player.getClan() == null) || player.getClan().getVariables().hasVariable("TOH_DONE")) + else if (player.getClan().getVariables().hasVariable("TOH_DONE")) { htmltext = "Roiental-AlreadyDone.html"; } + else if (!player.hasClanPrivilege(ClanPrivilege.CL_THRONE_OF_HEROES)) + { + player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); + } else { htmltext = "Roiental-01a.html"; @@ -76,14 +86,22 @@ public class Roiental extends AbstractNpcAI { htmltext = "Roiental-NoLevel.html"; } - else if ((player.getClan() == null) || (player.getClan().getLevel() < CLAN_MIN_LVL_MR)) + else if (player.getClan() == null) + { + player.sendPacket(SystemMessageId.YOU_DO_NOT_BELONG_TO_ANY_CLAN); + } + else if ((player.getClan().getLevel() < CLAN_MIN_LVL_MR)) { htmltext = "Roiental-03b.html"; } - else if ((player.getClan() == null) || player.getClan().getVariables().hasVariable("TOH_DONE")) + else if (player.getClan().getVariables().hasVariable("TOH_DONE")) { htmltext = "Roiental-AlreadyDone.html"; } + else if (!player.hasClanPrivilege(ClanPrivilege.CL_THRONE_OF_HEROES)) + { + player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); + } else { htmltext = "Roiental-01b.html"; @@ -95,14 +113,22 @@ public class Roiental extends AbstractNpcAI { htmltext = "Roiental-NoLevel.html"; } - else if ((player.getClan() == null) || (player.getClan().getLevel() < CLAN_MIN_LVL_TA)) + else if (player.getClan() == null) + { + player.sendPacket(SystemMessageId.YOU_DO_NOT_BELONG_TO_ANY_CLAN); + } + else if ((player.getClan().getLevel() < CLAN_MIN_LVL_TA)) { htmltext = "Roiental-03c.html"; } - else if ((player.getClan() == null) || player.getClan().getVariables().hasVariable("TOH_DONE")) + else if (player.getClan().getVariables().hasVariable("TOH_DONE")) { htmltext = "Roiental-AlreadyDone.html"; } + else if (!player.hasClanPrivilege(ClanPrivilege.CL_THRONE_OF_HEROES)) + { + player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); + } else { htmltext = "Roiental-01c.html"; diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 9f671f383a..29ebda96fb 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -151,7 +151,7 @@ public class CastleChamberlain extends AbstractNpcAI private final String funcConfirmHtml(Player player, Npc npc, Castle castle, int func, int level) { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { final NpcHtmlMessage html; final String fstring = (func == Castle.FUNC_TELEPORT) ? "9" : "10"; @@ -461,7 +461,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "siege_functions": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { if (castle.getSiege().isInProgress()) { @@ -484,7 +484,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "manage_doors": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { if (st.hasMoreTokens()) { @@ -511,7 +511,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "upgrade_doors": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { final int type = Integer.parseInt(st.nextToken()); final int level = Integer.parseInt(st.nextToken()); @@ -528,7 +528,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "upgrade_doors_confirm": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { if (castle.getSiege().isInProgress()) { @@ -579,7 +579,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "manage_trap": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { if (st.hasMoreTokens()) { @@ -608,7 +608,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "upgrade_trap": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { final String trapIndex = st.nextToken(); final int level = Integer.parseInt(st.nextToken()); @@ -626,7 +626,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "upgrade_trap_confirm": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { if (castle.getSiege().isInProgress()) { @@ -688,7 +688,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "manage_vault": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_TAXES)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_TAXES)) { final NpcHtmlMessage html = getHtmlPacket(player, npc, "castlemanagevault.html"); html.replace("%tax_income%", Util.formatAdena(castle.getTreasury())); @@ -702,7 +702,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "manage_vault_deposit": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_TAXES)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_TAXES)) { final NpcHtmlMessage html = getHtmlPacket(player, npc, "castlemanagevault_deposit.html"); html.replace("%tax_income%", Util.formatAdena(castle.getTreasury())); @@ -716,7 +716,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "manage_vault_withdraw": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_TAXES)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_TAXES)) { final NpcHtmlMessage html = getHtmlPacket(player, npc, "castlemanagevault_withdraw.html"); html.replace("%tax_income%", Util.formatAdena(castle.getTreasury())); @@ -730,7 +730,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "deposit": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_TAXES)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_TAXES)) { final long amount = (st.hasMoreTokens()) ? Long.parseLong(st.nextToken()) : 0; if ((amount > 0) && (amount < Inventory.MAX_ADENA)) @@ -755,7 +755,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "withdraw": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_TAXES)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_TAXES)) { final long amount = (st.hasMoreTokens()) ? Long.parseLong(st.nextToken()) : 0; if (amount <= castle.getTreasury()) @@ -832,7 +832,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "doors": { - if (!isOwner(player, npc) || !player.hasClanPrivilege(ClanPrivilege.CS_OPEN_DOOR)) + if (!isOwner(player, npc) || !player.hasClanPrivilege(ClanPrivilege.CS_ENTRY_EXIT_RIGHTS)) { htmltext = "chamberlain-21.html"; } @@ -848,7 +848,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "operate_door": { - if (!isOwner(player, npc) || !player.hasClanPrivilege(ClanPrivilege.CS_OPEN_DOOR)) + if (!isOwner(player, npc) || !player.hasClanPrivilege(ClanPrivilege.CS_ENTRY_EXIT_RIGHTS)) { htmltext = "chamberlain-21.html"; } @@ -869,12 +869,12 @@ public class CastleChamberlain extends AbstractNpcAI } case "additional_functions": { - htmltext = (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) ? "castletdecomanage.html" : "chamberlain-21.html"; + htmltext = (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) ? "castletdecomanage.html" : "chamberlain-21.html"; break; } case "recovery": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { final NpcHtmlMessage html = getHtmlPacket(player, npc, "castledeco-AR01.html"); funcReplace(castle, html, Castle.FUNC_RESTORE_HP, "HP"); @@ -890,7 +890,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "other": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { final NpcHtmlMessage html = getHtmlPacket(player, npc, "castledeco-AE01.html"); funcReplace(castle, html, Castle.FUNC_TELEPORT, "TP"); @@ -935,7 +935,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "set_func": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { final int func = Integer.parseInt(st.nextToken()); final int level = Integer.parseInt(st.nextToken()); @@ -1081,7 +1081,7 @@ public class CastleChamberlain extends AbstractNpcAI } case "list_siege_clans": { - if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_SIEGE)) + if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_SIEGE_WAR)) { castle.getSiege().listRegisterClan(player); } diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java index 3e2cd16930..8ca546336f 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java @@ -340,7 +340,7 @@ public class CastleCourtMagician extends AbstractNpcAI } case "squadSkill": { - if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_TROOPS_FAME)) + if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_SETTINGS)) { RequestAcquireSkill.showSubUnitSkillList(player); } diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java index 7741cfc94b..c29a45aa5a 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java @@ -136,7 +136,7 @@ public class CastleDoorManager extends AbstractNpcAI @Override public String onFirstTalk(Npc npc, Player player) { - return isOwningClan(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_OPEN_DOOR) ? getHtmlName(npc) + ".html" : getHtmlName(npc) + "-no.html"; + return isOwningClan(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_ENTRY_EXIT_RIGHTS) ? getHtmlName(npc) + ".html" : getHtmlName(npc) + "-no.html"; } private String getHtmlName(Npc npc) diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java index 7fe2abc3d4..657fb09ed9 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java @@ -74,7 +74,7 @@ public class ClanHallDoorManager extends AbstractNpcAI } case "manageDoors": { - if (isOwningClan(player, npc) && st.hasMoreTokens() && player.hasClanPrivilege(ClanPrivilege.CH_OPEN_DOOR)) + if (isOwningClan(player, npc) && st.hasMoreTokens() && player.hasClanPrivilege(ClanPrivilege.CH_ENTRY_EXIT_RIGHTS)) { final boolean open = st.nextToken().equals("1"); clanHall.openCloseDoors(open); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java index 63e155aac8..217d3dd1f9 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java @@ -134,7 +134,7 @@ public class ClanHallManager extends AbstractNpcAI } case "manageDoors": { - if (player.hasClanPrivilege(ClanPrivilege.CH_OPEN_DOOR)) + if (player.hasClanPrivilege(ClanPrivilege.CH_ENTRY_EXIT_RIGHTS)) { if (st.hasMoreTokens()) { @@ -175,7 +175,7 @@ public class ClanHallManager extends AbstractNpcAI } case "useFunctions": { - if (player.hasClanPrivilege(ClanPrivilege.CH_OTHER_RIGHTS)) + if (player.hasClanPrivilege(ClanPrivilege.CH_USE_FUNCTIONS)) { if (!st.hasMoreTokens()) { @@ -303,7 +303,7 @@ public class ClanHallManager extends AbstractNpcAI } case "manageFunctions": { - if (player.hasClanPrivilege(ClanPrivilege.CH_SET_FUNCTIONS)) + if (player.hasClanPrivilege(ClanPrivilege.CH_SETTTINGS)) { if (!st.hasMoreTokens()) { diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java index 79742f7171..1bb90fa8af 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java @@ -100,7 +100,7 @@ public class FortressSiegeManager extends AbstractNpcAI html.replace("%clanName%", fortress.getOwnerClan().getName()); return html.getHtml(); } - else if (!player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_SIEGE)) + else if (!player.hasClanPrivilege(ClanPrivilege.CS_SIEGE_WAR)) { htmltext = "FortressSiegeManager-10.html"; } @@ -169,7 +169,7 @@ public class FortressSiegeManager extends AbstractNpcAI html.replace("%clanName%", fortress.getOwnerClan().getName()); return html.getHtml(); } - else if (!player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_SIEGE)) + else if (!player.hasClanPrivilege(ClanPrivilege.CS_SIEGE_WAR)) { htmltext = "FortressSiegeManager-10.html"; } diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java index ec177e537e..b491443c92 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java @@ -254,7 +254,7 @@ public class SupportUnitCaptain extends AbstractNpcAI } case "squadSkill": { - if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_TROOPS_FAME)) + if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_SETTINGS)) { RequestAcquireSkill.showSubUnitSkillList(player); } diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index e7113941ec..8fa9547da4 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -80,7 +80,7 @@ public class ClanWarehouse implements IBypassHandler { player.sendPacket(ActionFailed.STATIC_PACKET); - if (!player.hasClanPrivilege(ClanPrivilege.CL_VIEW_WAREHOUSE)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_WAREHOUSE_SEARCH)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_RIGHT_TO_USE_THE_CLAN_WAREHOUSE); return true; diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/vehicles/AirShipController.java index 231be2fffd..1c328d7a26 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/vehicles/AirShipController.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/vehicles/AirShipController.java @@ -134,7 +134,7 @@ public abstract class AirShipController extends AbstractNpcAI player.sendPacket(SystemMessageId.ANOTHER_AIRSHIP_HAS_BEEN_SUMMONED_TO_THE_WHARF_PLEASE_TRY_AGAIN_LATER); return null; } - if (!player.hasClanPrivilege(ClanPrivilege.CL_SUMMON_AIRSHIP)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_USE_FUNCTIONS)) { player.sendPacket(SystemMessageId.AIRSHIP_SUMMON_LICENSE_REGISTRATION_CAN_ONLY_BE_DONE_BY_THE_CLAN_LEADER); return null; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/FortManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/FortManager.java index 50bd50bf13..d0b36d8c93 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/FortManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/FortManager.java @@ -185,7 +185,7 @@ public class FortManager extends Merchant else if (actualCommand.equalsIgnoreCase("operate_door")) // door // control { - if (player.hasClanPrivilege(ClanPrivilege.CS_OPEN_DOOR)) + if (player.hasClanPrivilege(ClanPrivilege.CS_ENTRY_EXIT_RIGHTS)) { if (!val.isEmpty()) { @@ -230,7 +230,7 @@ public class FortManager extends Merchant else if (actualCommand.equalsIgnoreCase("manage_vault")) { final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); - if (player.hasClanPrivilege(ClanPrivilege.CL_VIEW_WAREHOUSE)) + if (player.hasClanPrivilege(ClanPrivilege.CL_WAREHOUSE_SEARCH)) { if (val.equalsIgnoreCase("deposit")) { @@ -320,7 +320,7 @@ public class FortManager extends Merchant } else if (actualCommand.equalsIgnoreCase("manage")) { - if (player.hasClanPrivilege(ClanPrivilege.CS_SET_FUNCTIONS)) + if (player.hasClanPrivilege(ClanPrivilege.CS_SETTINGS)) { if (val.equalsIgnoreCase("recovery")) { @@ -995,7 +995,7 @@ public class FortManager extends Merchant private void showVaultWindowWithdraw(Player player) { - if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_VIEW_WAREHOUSE)) + if (player.isClanLeader() || player.hasClanPrivilege(ClanPrivilege.CL_WAREHOUSE_SEARCH)) { player.sendPacket(ActionFailed.STATIC_PACKET); player.setActiveWarehouse(player.getClan().getWarehouse()); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java index 13e37f6352..3b7fd3469a 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -2040,7 +2040,7 @@ public class Clan implements IIdentifiable, INamable { return false; } - if (!player.hasClanPrivilege(ClanPrivilege.CL_JOIN_CLAN)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_INVITE)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanPrivilege.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanPrivilege.java index 29fc684cbf..7dfa83fcd1 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanPrivilege.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanPrivilege.java @@ -25,35 +25,35 @@ public enum ClanPrivilege { /** dummy entry */ DUMMY, - /** Privilege to join clan */ - CL_JOIN_CLAN, - /** Privilege to give a title */ - CL_GIVE_TITLE, - /** Privilege to view warehouse content */ - CL_VIEW_WAREHOUSE, - /** Privilege to manage clan ranks */ + + /** System Privileges */ + CL_INVITE, + CL_MANAGE_TITLES, + CL_WAREHOUSE_SEARCH, CL_MANAGE_RANKS, - CL_PLEDGE_WAR, + CL_CLAN_WAR, CL_DISMISS, - /** Privilege to register clan crest */ - CL_REGISTER_CREST, - CL_APPRENTICE, - CL_TROOPS_FAME, - CL_SUMMON_AIRSHIP, - /** Privilege to open a door */ - CH_OPEN_DOOR, - CH_OTHER_RIGHTS, + CL_EDIT_CREST, + CL_USE_FUNCTIONS, + CL_SETTINGS, + CL_THRONE_OF_HEROES, + + /** Clan Hall Privileges */ + CH_ENTRY_EXIT_RIGHTS, + CH_USE_FUNCTIONS, CH_AUCTION, CH_DISMISS, - CH_SET_FUNCTIONS, - CS_OPEN_DOOR, - CS_MANOR_ADMIN, - CS_MANAGE_SIEGE, + CH_SETTTINGS, + + /** Castle/Fortress Privileges */ + CS_ENTRY_EXIT_RIGHTS, + CS_SIEGE_WAR, CS_USE_FUNCTIONS, + CS_SETTINGS, CS_DISMISS, - CS_TAXES, + CS_MANAGE_TAXES, CS_MERCENARIES, - CS_SET_FUNCTIONS; + CS_MANOR_ADMIN; public int getBitmask() { diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index 4b7c0c623f..c95761c56c 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -183,7 +183,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } case SUBPLEDGE: { - if (!player.isClanLeader() || !player.hasClanPrivilege(ClanPrivilege.CL_TROOPS_FAME)) + if (!player.isClanLeader() || !player.hasClanPrivilege(ClanPrivilege.CL_SETTINGS)) { return; } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 218e629395..c090be32fb 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -113,7 +113,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket } case SUBPLEDGE: { - if (!player.isClanLeader() || !player.hasClanPrivilege(ClanPrivilege.CL_TROOPS_FAME)) + if (!player.isClanLeader() || !player.hasClanPrivilege(ClanPrivilege.CL_SETTINGS)) { return; } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index af65e15cae..1437171c64 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -75,7 +75,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (!player.hasClanPrivilege(ClanPrivilege.CL_REGISTER_CREST)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_EDIT_CREST)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java index 9624152294..7d683a77f0 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java @@ -55,7 +55,7 @@ public class RequestGiveNickName implements IClientIncomingPacket else { // Can the player change/give a title? - if (!player.hasClanPrivilege(ClanPrivilege.CL_GIVE_TITLE)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_MANAGE_TITLES)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index d4e22b4a84..1d254b8cc6 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -52,7 +52,7 @@ public class RequestJoinSiege implements IClientIncomingPacket return; } - if (!player.hasClanPrivilege(ClanPrivilege.CS_MANAGE_SIEGE)) + if (!player.hasClanPrivilege(ClanPrivilege.CS_SIEGE_WAR)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java index 464ad76c9f..cc7f14fdc1 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java @@ -65,7 +65,7 @@ public class RequestPledgePower implements IClientIncomingPacket // Clan war, right to dismiss, set functions // Auction, manage taxes, attack/defend registration, mercenary management // => Leaves only CP_CL_VIEW_WAREHOUSE, CP_CH_OPEN_DOOR, CP_CS_OPEN_DOOR? - _privs &= ClanPrivilege.CL_VIEW_WAREHOUSE.getBitmask() | ClanPrivilege.CH_OPEN_DOOR.getBitmask() | ClanPrivilege.CS_OPEN_DOOR.getBitmask(); + _privs &= ClanPrivilege.CL_WAREHOUSE_SEARCH.getBitmask() | ClanPrivilege.CH_ENTRY_EXIT_RIGHTS.getBitmask() | ClanPrivilege.CS_ENTRY_EXIT_RIGHTS.getBitmask(); } player.getClan().setRankPrivs(_rank, _privs); } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java index c6cab61026..2828377897 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java @@ -54,7 +54,7 @@ public class RequestPledgeSetAcademyMaster implements IClientIncomingPacket return; } - if (!player.hasClanPrivilege(ClanPrivilege.CL_APPRENTICE)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_DISMISS)) { player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_THE_RIGHT_TO_DISMISS_MENTEES); return; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index b327d72320..c1e4553830 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -80,7 +80,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (!player.hasClanPrivilege(ClanPrivilege.CL_REGISTER_CREST)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_EDIT_CREST)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index c367a7a173..7c7acf5fc1 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -63,7 +63,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR)) + else if (!player.hasClanPrivilege(ClanPrivilege.CL_CLAN_WAR)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java index f9bf7da766..dd26e852b5 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java @@ -69,7 +69,7 @@ public class RequestStopPledgeWar implements IClientIncomingPacket } // Check if player who does the request has the correct rights to do it - if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR)) + if (!player.hasClanPrivilege(ClanPrivilege.CL_CLAN_WAR)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java index 1a642e3f4a..b582d59d5d 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java @@ -72,7 +72,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR)) + else if (!player.hasClanPrivilege(ClanPrivilege.CL_CLAN_WAR)) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 7f8843c3a1..4c23067767 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -103,7 +103,7 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket if (Config.ALT_MEMBERS_CAN_WITHDRAW_FROM_CLANWH) { - if ((warehouse instanceof ClanWarehouse) && !player.hasClanPrivilege(ClanPrivilege.CL_VIEW_WAREHOUSE)) + if ((warehouse instanceof ClanWarehouse) && !player.hasClanPrivilege(ClanPrivilege.CL_WAREHOUSE_SEARCH)) { return; }