From f3c4b6ef4409e1d86b29a53327822557833114cc Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 23 May 2022 11:39:22 +0000 Subject: [PATCH] Clan system adjustments. Contributed by nasseka. --- .../dist/game/config/Character.ini | 8 ++++---- .../java/org/l2jmobius/Config.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/clan/Clan.java | 2 +- .../network/clientpackets/RequestOustPledgeMember.java | 4 ++-- .../network/clientpackets/RequestWithdrawalPledge.java | 2 +- .../dist/game/config/Character.ini | 8 ++++---- .../java/org/l2jmobius/Config.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/clan/Clan.java | 4 ++-- .../network/clientpackets/RequestOustPledgeMember.java | 4 ++-- .../RequestPledgeSignInForOpenJoiningMethod.java | 2 +- .../network/clientpackets/RequestWithdrawalPledge.java | 2 +- .../clientpackets/pledgebonus/RequestPledgeBonusOpen.java | 2 +- .../dist/game/config/Character.ini | 8 ++++---- .../java/org/l2jmobius/Config.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/clan/Clan.java | 4 ++-- .../network/clientpackets/RequestOustPledgeMember.java | 4 ++-- .../RequestPledgeSignInForOpenJoiningMethod.java | 2 +- .../network/clientpackets/RequestWithdrawalPledge.java | 2 +- .../clientpackets/pledgebonus/RequestPledgeBonusOpen.java | 2 +- .../dist/game/config/Character.ini | 8 ++++---- .../java/org/l2jmobius/Config.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/clan/Clan.java | 4 ++-- .../network/clientpackets/RequestOustPledgeMember.java | 4 ++-- .../RequestPledgeSignInForOpenJoiningMethod.java | 2 +- .../network/clientpackets/RequestWithdrawalPledge.java | 2 +- .../clientpackets/pledgebonus/RequestPledgeBonusOpen.java | 2 +- 26 files changed, 49 insertions(+), 49 deletions(-) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/config/Character.ini b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/config/Character.ini index db599105dc..e92a32d789 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/config/Character.ini +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/config/Character.ini @@ -523,9 +523,9 @@ StoreRecipeShopList = False # Default: False AltClanLeaderInstantActivation = False -# Number of days you have to wait before joining another clan. +# Number of minutes you have to wait before joining another clan. # Default: 1 -DaysBeforeJoinAClan = 1 +MinutesBeforeJoinAClan = 1 # Number of days you have to wait before creating a new clan. # Default: 10 @@ -568,8 +568,8 @@ AltMembersCanWithdrawFromClanWH = False RemoveCastleCirclets = True # Number of members needed to request a clan war. -# Default: 15 -AltClanMembersForWar = 15 +# Default: 1 +AltClanMembersForWar = 1 # The the time that player must be online to be counted as online player and registered for clan bonus # Default: 30mins diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/Config.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/Config.java index b1635cc01c..e2bf6c95db 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/Config.java @@ -267,7 +267,7 @@ public class Config public static double ALT_GAME_CREATION_RARE_XPSP_RATE; public static double ALT_GAME_CREATION_SP_RATE; public static boolean ALT_CLAN_LEADER_INSTANT_ACTIVATION; - public static int ALT_CLAN_JOIN_DAYS; + public static int ALT_CLAN_JOIN_MINS; public static int ALT_CLAN_CREATE_DAYS; public static int ALT_CLAN_DISSOLVE_DAYS; public static int ALT_ALLY_JOIN_DAYS_WHEN_LEAVED; @@ -1825,7 +1825,7 @@ public class Config ALT_GAME_CREATION_SP_RATE = characterConfig.getDouble("AltGameCreationSpRate", 1); ALT_GAME_CREATION_RARE_XPSP_RATE = characterConfig.getDouble("AltGameCreationRareXpSpRate", 2); ALT_CLAN_LEADER_INSTANT_ACTIVATION = characterConfig.getBoolean("AltClanLeaderInstantActivation", false); - ALT_CLAN_JOIN_DAYS = characterConfig.getInt("DaysBeforeJoinAClan", 1); + ALT_CLAN_JOIN_MINS = characterConfig.getInt("MinutesBeforeJoinAClan", 1); ALT_CLAN_CREATE_DAYS = characterConfig.getInt("DaysBeforeCreateAClan", 10); ALT_CLAN_DISSOLVE_DAYS = characterConfig.getInt("DaysToPassToDissolveAClan", 7); ALT_ALLY_JOIN_DAYS_WHEN_LEAVED = characterConfig.getInt("DaysBeforeJoinAllyWhenLeaved", 1); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/Clan.java index 8d4daccfeb..4662cf7320 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1088,7 +1088,7 @@ public class Clan implements IIdentifiable, INamable setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_MINS * 60000)) < System.currentTimeMillis()) // 24*60*60*1000 = 60000 { setCharPenaltyExpiryTime(0); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 479f357641..2268449145 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -81,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 - clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_MINS * 60000)); // 60*1000 = 60000 + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_MINS * 86400000)); // 60*1000 = 60000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_DISMISSED_FROM_THE_CLAN); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index 7ff8b8c71b..479ca1ebcd 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -62,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_MINS * 60000)); // 60*1000 = 60000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/config/Character.ini b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/config/Character.ini index db599105dc..e92a32d789 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/config/Character.ini +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/config/Character.ini @@ -523,9 +523,9 @@ StoreRecipeShopList = False # Default: False AltClanLeaderInstantActivation = False -# Number of days you have to wait before joining another clan. +# Number of minutes you have to wait before joining another clan. # Default: 1 -DaysBeforeJoinAClan = 1 +MinutesBeforeJoinAClan = 1 # Number of days you have to wait before creating a new clan. # Default: 10 @@ -568,8 +568,8 @@ AltMembersCanWithdrawFromClanWH = False RemoveCastleCirclets = True # Number of members needed to request a clan war. -# Default: 15 -AltClanMembersForWar = 15 +# Default: 1 +AltClanMembersForWar = 1 # The the time that player must be online to be counted as online player and registered for clan bonus # Default: 30mins diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/Config.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/Config.java index fe41441a9b..afdb3f292e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/Config.java @@ -267,7 +267,7 @@ public class Config public static double ALT_GAME_CREATION_RARE_XPSP_RATE; public static double ALT_GAME_CREATION_SP_RATE; public static boolean ALT_CLAN_LEADER_INSTANT_ACTIVATION; - public static int ALT_CLAN_JOIN_DAYS; + public static int ALT_CLAN_JOIN_MINS; public static int ALT_CLAN_CREATE_DAYS; public static int ALT_CLAN_DISSOLVE_DAYS; public static int ALT_ALLY_JOIN_DAYS_WHEN_LEAVED; @@ -1829,7 +1829,7 @@ public class Config ALT_GAME_CREATION_SP_RATE = characterConfig.getDouble("AltGameCreationSpRate", 1); ALT_GAME_CREATION_RARE_XPSP_RATE = characterConfig.getDouble("AltGameCreationRareXpSpRate", 2); ALT_CLAN_LEADER_INSTANT_ACTIVATION = characterConfig.getBoolean("AltClanLeaderInstantActivation", false); - ALT_CLAN_JOIN_DAYS = characterConfig.getInt("DaysBeforeJoinAClan", 1); + ALT_CLAN_JOIN_MINS = characterConfig.getInt("MinutesBeforeJoinAClan", 1); ALT_CLAN_CREATE_DAYS = characterConfig.getInt("DaysBeforeCreateAClan", 10); ALT_CLAN_DISSOLVE_DAYS = characterConfig.getInt("DaysToPassToDissolveAClan", 7); ALT_ALLY_JOIN_DAYS_WHEN_LEAVED = characterConfig.getInt("DaysBeforeJoinAllyWhenLeaved", 1); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/Clan.java index 845f42b7d9..0b47687c7a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1109,7 +1109,7 @@ public class Clan implements IIdentifiable, INamable setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_MINS * 60000)) < System.currentTimeMillis()) // 24*60*60*1000 = 60000 { setCharPenaltyExpiryTime(0); } @@ -2234,7 +2234,7 @@ public class Clan implements IIdentifiable, INamable { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_S2_MIN_AFTER_LEAVING_THE_PREVIOUS_ONE); sm.addString(target.getName()); - sm.addInt(Config.ALT_CLAN_JOIN_DAYS); + sm.addInt(Config.ALT_CLAN_JOIN_MINS); player.sendPacket(sm); return false; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 479f357641..2268449145 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -81,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 - clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_MINS * 60000)); // 60*1000 = 60000 + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_MINS * 86400000)); // 60*1000 = 60000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_DISMISSED_FROM_THE_CLAN); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index a8fdda6dd1..ee245b4191 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java @@ -74,7 +74,7 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_S2_MIN_AFTER_LEAVING_THE_PREVIOUS_ONE); sm.addString(player.getName()); - sm.addInt(Config.ALT_CLAN_JOIN_DAYS); + sm.addInt(Config.ALT_CLAN_JOIN_MINS); player.sendPacket(sm); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index 7ff8b8c71b..479ca1ebcd 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -62,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_MINS * 60000)); // 60*1000 = 60000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusOpen.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusOpen.java index b7dfcbc418..87ab7a19c3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusOpen.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusOpen.java @@ -45,7 +45,7 @@ public class RequestPledgeBonusOpen implements IClientIncomingPacket } player.sendPacket(new ExPledgeBonusOpen(player)); - final long joinedTime = (player.getClanJoinExpiryTime() - (Config.ALT_CLAN_JOIN_DAYS * 60000)); + final long joinedTime = (player.getClanJoinExpiryTime() - (Config.ALT_CLAN_JOIN_MINS * 60000)); player.sendPacket(new ExPledgeDonationInfo(player.getClanDonationPoints(), (joinedTime + 86400000) < System.currentTimeMillis())); } } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/config/Character.ini b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/config/Character.ini index db599105dc..e92a32d789 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/config/Character.ini +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/config/Character.ini @@ -523,9 +523,9 @@ StoreRecipeShopList = False # Default: False AltClanLeaderInstantActivation = False -# Number of days you have to wait before joining another clan. +# Number of minutes you have to wait before joining another clan. # Default: 1 -DaysBeforeJoinAClan = 1 +MinutesBeforeJoinAClan = 1 # Number of days you have to wait before creating a new clan. # Default: 10 @@ -568,8 +568,8 @@ AltMembersCanWithdrawFromClanWH = False RemoveCastleCirclets = True # Number of members needed to request a clan war. -# Default: 15 -AltClanMembersForWar = 15 +# Default: 1 +AltClanMembersForWar = 1 # The the time that player must be online to be counted as online player and registered for clan bonus # Default: 30mins diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/Config.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/Config.java index 928509e9a9..6692de63ee 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/Config.java @@ -268,7 +268,7 @@ public class Config public static double ALT_GAME_CREATION_RARE_XPSP_RATE; public static double ALT_GAME_CREATION_SP_RATE; public static boolean ALT_CLAN_LEADER_INSTANT_ACTIVATION; - public static int ALT_CLAN_JOIN_DAYS; + public static int ALT_CLAN_JOIN_MINS; public static int ALT_CLAN_CREATE_DAYS; public static int ALT_CLAN_DISSOLVE_DAYS; public static int ALT_ALLY_JOIN_DAYS_WHEN_LEAVED; @@ -1836,7 +1836,7 @@ public class Config ALT_GAME_CREATION_SP_RATE = characterConfig.getDouble("AltGameCreationSpRate", 1); ALT_GAME_CREATION_RARE_XPSP_RATE = characterConfig.getDouble("AltGameCreationRareXpSpRate", 2); ALT_CLAN_LEADER_INSTANT_ACTIVATION = characterConfig.getBoolean("AltClanLeaderInstantActivation", false); - ALT_CLAN_JOIN_DAYS = characterConfig.getInt("DaysBeforeJoinAClan", 1); + ALT_CLAN_JOIN_MINS = characterConfig.getInt("MinutesBeforeJoinAClan", 1); ALT_CLAN_CREATE_DAYS = characterConfig.getInt("DaysBeforeCreateAClan", 10); ALT_CLAN_DISSOLVE_DAYS = characterConfig.getInt("DaysToPassToDissolveAClan", 7); ALT_ALLY_JOIN_DAYS_WHEN_LEAVED = characterConfig.getInt("DaysBeforeJoinAllyWhenLeaved", 1); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/clan/Clan.java index 845f42b7d9..0b47687c7a 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1109,7 +1109,7 @@ public class Clan implements IIdentifiable, INamable setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_MINS * 60000)) < System.currentTimeMillis()) // 24*60*60*1000 = 60000 { setCharPenaltyExpiryTime(0); } @@ -2234,7 +2234,7 @@ public class Clan implements IIdentifiable, INamable { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_S2_MIN_AFTER_LEAVING_THE_PREVIOUS_ONE); sm.addString(target.getName()); - sm.addInt(Config.ALT_CLAN_JOIN_DAYS); + sm.addInt(Config.ALT_CLAN_JOIN_MINS); player.sendPacket(sm); return false; } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 479f357641..2268449145 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -81,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 - clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_MINS * 60000)); // 60*1000 = 60000 + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_MINS * 86400000)); // 60*1000 = 60000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_DISMISSED_FROM_THE_CLAN); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index a8fdda6dd1..ee245b4191 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java @@ -74,7 +74,7 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_S2_MIN_AFTER_LEAVING_THE_PREVIOUS_ONE); sm.addString(player.getName()); - sm.addInt(Config.ALT_CLAN_JOIN_DAYS); + sm.addInt(Config.ALT_CLAN_JOIN_MINS); player.sendPacket(sm); return; } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index 7ff8b8c71b..479ca1ebcd 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -62,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_MINS * 60000)); // 60*1000 = 60000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusOpen.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusOpen.java index b7dfcbc418..87ab7a19c3 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusOpen.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusOpen.java @@ -45,7 +45,7 @@ public class RequestPledgeBonusOpen implements IClientIncomingPacket } player.sendPacket(new ExPledgeBonusOpen(player)); - final long joinedTime = (player.getClanJoinExpiryTime() - (Config.ALT_CLAN_JOIN_DAYS * 60000)); + final long joinedTime = (player.getClanJoinExpiryTime() - (Config.ALT_CLAN_JOIN_MINS * 60000)); player.sendPacket(new ExPledgeDonationInfo(player.getClanDonationPoints(), (joinedTime + 86400000) < System.currentTimeMillis())); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/config/Character.ini b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/config/Character.ini index db599105dc..e92a32d789 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/config/Character.ini +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/config/Character.ini @@ -523,9 +523,9 @@ StoreRecipeShopList = False # Default: False AltClanLeaderInstantActivation = False -# Number of days you have to wait before joining another clan. +# Number of minutes you have to wait before joining another clan. # Default: 1 -DaysBeforeJoinAClan = 1 +MinutesBeforeJoinAClan = 1 # Number of days you have to wait before creating a new clan. # Default: 10 @@ -568,8 +568,8 @@ AltMembersCanWithdrawFromClanWH = False RemoveCastleCirclets = True # Number of members needed to request a clan war. -# Default: 15 -AltClanMembersForWar = 15 +# Default: 1 +AltClanMembersForWar = 1 # The the time that player must be online to be counted as online player and registered for clan bonus # Default: 30mins diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/Config.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/Config.java index 430c8b55d1..a30f5bfd1e 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/Config.java @@ -268,7 +268,7 @@ public class Config public static double ALT_GAME_CREATION_RARE_XPSP_RATE; public static double ALT_GAME_CREATION_SP_RATE; public static boolean ALT_CLAN_LEADER_INSTANT_ACTIVATION; - public static int ALT_CLAN_JOIN_DAYS; + public static int ALT_CLAN_JOIN_MINS; public static int ALT_CLAN_CREATE_DAYS; public static int ALT_CLAN_DISSOLVE_DAYS; public static int ALT_ALLY_JOIN_DAYS_WHEN_LEAVED; @@ -1836,7 +1836,7 @@ public class Config ALT_GAME_CREATION_SP_RATE = characterConfig.getDouble("AltGameCreationSpRate", 1); ALT_GAME_CREATION_RARE_XPSP_RATE = characterConfig.getDouble("AltGameCreationRareXpSpRate", 2); ALT_CLAN_LEADER_INSTANT_ACTIVATION = characterConfig.getBoolean("AltClanLeaderInstantActivation", false); - ALT_CLAN_JOIN_DAYS = characterConfig.getInt("DaysBeforeJoinAClan", 1); + ALT_CLAN_JOIN_MINS = characterConfig.getInt("MinutesBeforeJoinAClan", 1); ALT_CLAN_CREATE_DAYS = characterConfig.getInt("DaysBeforeCreateAClan", 10); ALT_CLAN_DISSOLVE_DAYS = characterConfig.getInt("DaysToPassToDissolveAClan", 7); ALT_ALLY_JOIN_DAYS_WHEN_LEAVED = characterConfig.getInt("DaysBeforeJoinAllyWhenLeaved", 1); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/clan/Clan.java index b06408a9b3..901e80c02c 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1109,7 +1109,7 @@ public class Clan implements IIdentifiable, INamable setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_MINS * 60000)) < System.currentTimeMillis()) // 24*60*60*1000 = 60000 { setCharPenaltyExpiryTime(0); } @@ -2234,7 +2234,7 @@ public class Clan implements IIdentifiable, INamable { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_S2_MIN_AFTER_LEAVING_THE_PREVIOUS_ONE); sm.addString(target.getName()); - sm.addInt(Config.ALT_CLAN_JOIN_DAYS); + sm.addInt(Config.ALT_CLAN_JOIN_MINS); player.sendPacket(sm); return false; } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 479f357641..2268449145 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -81,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 - clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_MINS * 60000)); // 60*1000 = 60000 + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_MINS * 86400000)); // 60*1000 = 60000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_DISMISSED_FROM_THE_CLAN); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index a8fdda6dd1..ee245b4191 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java @@ -74,7 +74,7 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_S2_MIN_AFTER_LEAVING_THE_PREVIOUS_ONE); sm.addString(player.getName()); - sm.addInt(Config.ALT_CLAN_JOIN_DAYS); + sm.addInt(Config.ALT_CLAN_JOIN_MINS); player.sendPacket(sm); return; } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index 7ff8b8c71b..479ca1ebcd 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -62,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_MINS * 60000)); // 60*1000 = 60000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusOpen.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusOpen.java index b7dfcbc418..87ab7a19c3 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusOpen.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusOpen.java @@ -45,7 +45,7 @@ public class RequestPledgeBonusOpen implements IClientIncomingPacket } player.sendPacket(new ExPledgeBonusOpen(player)); - final long joinedTime = (player.getClanJoinExpiryTime() - (Config.ALT_CLAN_JOIN_DAYS * 60000)); + final long joinedTime = (player.getClanJoinExpiryTime() - (Config.ALT_CLAN_JOIN_MINS * 60000)); player.sendPacket(new ExPledgeDonationInfo(player.getClanDonationPoints(), (joinedTime + 86400000) < System.currentTimeMillis())); } }