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

Clan system adjustments.

Browse Source 
Contributed by nasseka.
This commit is contained in:
MobiusDevelopment 2022-05-23 11:39:22 +00:00
parent f668fc8352
commit f3c4b6ef44
26 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/config/Character.ini vendored
View File

@ -523,9 +523,9 @@ StoreRecipeShopList = False
# Default: False # Default: False
AltClanLeaderInstantActivation = 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 # Default: 1
DaysBeforeJoinAClan = 1 MinutesBeforeJoinAClan = 1
# Number of days you have to wait before creating a new clan. # Number of days you have to wait before creating a new clan.
# Default: 10 # Default: 10
@ -568,8 +568,8 @@ AltMembersCanWithdrawFromClanWH = False
RemoveCastleCirclets = True RemoveCastleCirclets = True
# Number of members needed to request a clan war. # Number of members needed to request a clan war.
# Default: 15 # Default: 1
AltClanMembersForWar = 15 AltClanMembersForWar = 1
# The the time that player must be online to be counted as online player and registered for clan bonus # The the time that player must be online to be counted as online player and registered for clan bonus
# Default: 30mins # Default: 30mins

4
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/Config.java
View File

@ -267,7 +267,7 @@ public class Config
public static double ALT_GAME_CREATION_RARE_XPSP_RATE; public static double ALT_GAME_CREATION_RARE_XPSP_RATE;
public static double ALT_GAME_CREATION_SP_RATE; public static double ALT_GAME_CREATION_SP_RATE;
public static boolean ALT_CLAN_LEADER_INSTANT_ACTIVATION; 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_CREATE_DAYS;
public static int ALT_CLAN_DISSOLVE_DAYS; public static int ALT_CLAN_DISSOLVE_DAYS;
public static int ALT_ALLY_JOIN_DAYS_WHEN_LEAVED; 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_SP_RATE = characterConfig.getDouble("AltGameCreationSpRate", 1);
ALT_GAME_CREATION_RARE_XPSP_RATE = characterConfig.getDouble("AltGameCreationRareXpSpRate", 2); ALT_GAME_CREATION_RARE_XPSP_RATE = characterConfig.getDouble("AltGameCreationRareXpSpRate", 2);
ALT_CLAN_LEADER_INSTANT_ACTIVATION = characterConfig.getBoolean("AltClanLeaderInstantActivation", false); 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_CREATE_DAYS = characterConfig.getInt("DaysBeforeCreateAClan", 10);
ALT_CLAN_DISSOLVE_DAYS = characterConfig.getInt("DaysToPassToDissolveAClan", 7); ALT_CLAN_DISSOLVE_DAYS = characterConfig.getInt("DaysToPassToDissolveAClan", 7);
ALT_ALLY_JOIN_DAYS_WHEN_LEAVED = characterConfig.getInt("DaysBeforeJoinAllyWhenLeaved", 1); ALT_ALLY_JOIN_DAYS_WHEN_LEAVED = characterConfig.getInt("DaysBeforeJoinAllyWhenLeaved", 1);

2
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/Clan.java
View File

@ -1088,7 +1088,7 @@ public class Clan implements IIdentifiable, INamable
setAllyPenaltyExpiryTime(0, 0); setAllyPenaltyExpiryTime(0, 0);
} }
setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); 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); setCharPenaltyExpiryTime(0);
} }

4
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
View File

@ -81,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket
} }
// this also updates the database // this also updates the database
clan.removeClanMember(member.getObjectId(), 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_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_MINS * 86400000)); // 60*1000 = 60000
clan.updateClanInDB(); clan.updateClanInDB();
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_DISMISSED_FROM_THE_CLAN); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_DISMISSED_FROM_THE_CLAN);

2
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
View File

@ -62,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
} }
final Clan clan = player.getClan(); 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); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN);
sm.addString(player.getName()); sm.addString(player.getName());

8
L2J_Mobius_Essence_5.2_FrostLord/dist/game/config/Character.ini vendored
View File

@ -523,9 +523,9 @@ StoreRecipeShopList = False
# Default: False # Default: False
AltClanLeaderInstantActivation = 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 # Default: 1
DaysBeforeJoinAClan = 1 MinutesBeforeJoinAClan = 1
# Number of days you have to wait before creating a new clan. # Number of days you have to wait before creating a new clan.
# Default: 10 # Default: 10
@ -568,8 +568,8 @@ AltMembersCanWithdrawFromClanWH = False
RemoveCastleCirclets = True RemoveCastleCirclets = True
# Number of members needed to request a clan war. # Number of members needed to request a clan war.
# Default: 15 # Default: 1
AltClanMembersForWar = 15 AltClanMembersForWar = 1
# The the time that player must be online to be counted as online player and registered for clan bonus # The the time that player must be online to be counted as online player and registered for clan bonus
# Default: 30mins # Default: 30mins

4
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/Config.java
View File

@ -267,7 +267,7 @@ public class Config
public static double ALT_GAME_CREATION_RARE_XPSP_RATE; public static double ALT_GAME_CREATION_RARE_XPSP_RATE;
public static double ALT_GAME_CREATION_SP_RATE; public static double ALT_GAME_CREATION_SP_RATE;
public static boolean ALT_CLAN_LEADER_INSTANT_ACTIVATION; 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_CREATE_DAYS;
public static int ALT_CLAN_DISSOLVE_DAYS; public static int ALT_CLAN_DISSOLVE_DAYS;
public static int ALT_ALLY_JOIN_DAYS_WHEN_LEAVED; 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_SP_RATE = characterConfig.getDouble("AltGameCreationSpRate", 1);
ALT_GAME_CREATION_RARE_XPSP_RATE = characterConfig.getDouble("AltGameCreationRareXpSpRate", 2); ALT_GAME_CREATION_RARE_XPSP_RATE = characterConfig.getDouble("AltGameCreationRareXpSpRate", 2);
ALT_CLAN_LEADER_INSTANT_ACTIVATION = characterConfig.getBoolean("AltClanLeaderInstantActivation", false); 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_CREATE_DAYS = characterConfig.getInt("DaysBeforeCreateAClan", 10);
ALT_CLAN_DISSOLVE_DAYS = characterConfig.getInt("DaysToPassToDissolveAClan", 7); ALT_CLAN_DISSOLVE_DAYS = characterConfig.getInt("DaysToPassToDissolveAClan", 7);
ALT_ALLY_JOIN_DAYS_WHEN_LEAVED = characterConfig.getInt("DaysBeforeJoinAllyWhenLeaved", 1); ALT_ALLY_JOIN_DAYS_WHEN_LEAVED = characterConfig.getInt("DaysBeforeJoinAllyWhenLeaved", 1);

4
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/Clan.java
View File

@ -1109,7 +1109,7 @@ public class Clan implements IIdentifiable, INamable
setAllyPenaltyExpiryTime(0, 0); setAllyPenaltyExpiryTime(0, 0);
} }
setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); 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); 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); 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.addString(target.getName());
sm.addInt(Config.ALT_CLAN_JOIN_DAYS); sm.addInt(Config.ALT_CLAN_JOIN_MINS);
player.sendPacket(sm); player.sendPacket(sm);
return false; return false;
} }

4
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
View File

@ -81,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket
} }
// this also updates the database // this also updates the database
clan.removeClanMember(member.getObjectId(), 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_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_MINS * 86400000)); // 60*1000 = 60000
clan.updateClanInDB(); clan.updateClanInDB();
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_DISMISSED_FROM_THE_CLAN); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_DISMISSED_FROM_THE_CLAN);

2
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java
View File

@ -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); 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.addString(player.getName());
sm.addInt(Config.ALT_CLAN_JOIN_DAYS); sm.addInt(Config.ALT_CLAN_JOIN_MINS);
player.sendPacket(sm); player.sendPacket(sm);
return; return;
} }

2
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
View File

@ -62,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
} }
final Clan clan = player.getClan(); 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); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN);
sm.addString(player.getName()); sm.addString(player.getName());

2
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusOpen.java
View File

@ -45,7 +45,7 @@ public class RequestPledgeBonusOpen implements IClientIncomingPacket
} }
player.sendPacket(new ExPledgeBonusOpen(player)); 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())); player.sendPacket(new ExPledgeDonationInfo(player.getClanDonationPoints(), (joinedTime + 86400000) < System.currentTimeMillis()));
} }
} }

8
L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/config/Character.ini vendored
View File

@ -523,9 +523,9 @@ StoreRecipeShopList = False
# Default: False # Default: False
AltClanLeaderInstantActivation = 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 # Default: 1
DaysBeforeJoinAClan = 1 MinutesBeforeJoinAClan = 1
# Number of days you have to wait before creating a new clan. # Number of days you have to wait before creating a new clan.
# Default: 10 # Default: 10
@ -568,8 +568,8 @@ AltMembersCanWithdrawFromClanWH = False
RemoveCastleCirclets = True RemoveCastleCirclets = True
# Number of members needed to request a clan war. # Number of members needed to request a clan war.
# Default: 15 # Default: 1
AltClanMembersForWar = 15 AltClanMembersForWar = 1
# The the time that player must be online to be counted as online player and registered for clan bonus # The the time that player must be online to be counted as online player and registered for clan bonus
# Default: 30mins # Default: 30mins

4
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/Config.java
View File

@ -268,7 +268,7 @@ public class Config
public static double ALT_GAME_CREATION_RARE_XPSP_RATE; public static double ALT_GAME_CREATION_RARE_XPSP_RATE;
public static double ALT_GAME_CREATION_SP_RATE; public static double ALT_GAME_CREATION_SP_RATE;
public static boolean ALT_CLAN_LEADER_INSTANT_ACTIVATION; 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_CREATE_DAYS;
public static int ALT_CLAN_DISSOLVE_DAYS; public static int ALT_CLAN_DISSOLVE_DAYS;
public static int ALT_ALLY_JOIN_DAYS_WHEN_LEAVED; 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_SP_RATE = characterConfig.getDouble("AltGameCreationSpRate", 1);
ALT_GAME_CREATION_RARE_XPSP_RATE = characterConfig.getDouble("AltGameCreationRareXpSpRate", 2); ALT_GAME_CREATION_RARE_XPSP_RATE = characterConfig.getDouble("AltGameCreationRareXpSpRate", 2);
ALT_CLAN_LEADER_INSTANT_ACTIVATION = characterConfig.getBoolean("AltClanLeaderInstantActivation", false); 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_CREATE_DAYS = characterConfig.getInt("DaysBeforeCreateAClan", 10);
ALT_CLAN_DISSOLVE_DAYS = characterConfig.getInt("DaysToPassToDissolveAClan", 7); ALT_CLAN_DISSOLVE_DAYS = characterConfig.getInt("DaysToPassToDissolveAClan", 7);
ALT_ALLY_JOIN_DAYS_WHEN_LEAVED = characterConfig.getInt("DaysBeforeJoinAllyWhenLeaved", 1); ALT_ALLY_JOIN_DAYS_WHEN_LEAVED = characterConfig.getInt("DaysBeforeJoinAllyWhenLeaved", 1);

4
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/clan/Clan.java
View File

@ -1109,7 +1109,7 @@ public class Clan implements IIdentifiable, INamable
setAllyPenaltyExpiryTime(0, 0); setAllyPenaltyExpiryTime(0, 0);
} }
setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); 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); 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); 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.addString(target.getName());
sm.addInt(Config.ALT_CLAN_JOIN_DAYS); sm.addInt(Config.ALT_CLAN_JOIN_MINS);
player.sendPacket(sm); player.sendPacket(sm);
return false; return false;
} }

4
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
View File

@ -81,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket
} }
// this also updates the database // this also updates the database
clan.removeClanMember(member.getObjectId(), 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_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_MINS * 86400000)); // 60*1000 = 60000
clan.updateClanInDB(); clan.updateClanInDB();
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_DISMISSED_FROM_THE_CLAN); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_DISMISSED_FROM_THE_CLAN);

2
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java
View File

@ -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); 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.addString(player.getName());
sm.addInt(Config.ALT_CLAN_JOIN_DAYS); sm.addInt(Config.ALT_CLAN_JOIN_MINS);
player.sendPacket(sm); player.sendPacket(sm);
return; return;
} }

2
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
View File

@ -62,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
} }
final Clan clan = player.getClan(); 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); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN);
sm.addString(player.getName()); sm.addString(player.getName());

2
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusOpen.java
View File

@ -45,7 +45,7 @@ public class RequestPledgeBonusOpen implements IClientIncomingPacket
} }
player.sendPacket(new ExPledgeBonusOpen(player)); 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())); player.sendPacket(new ExPledgeDonationInfo(player.getClanDonationPoints(), (joinedTime + 86400000) < System.currentTimeMillis()));
} }
} }

8
L2J_Mobius_Essence_6.2_Vanguard/dist/game/config/Character.ini vendored
View File

@ -523,9 +523,9 @@ StoreRecipeShopList = False
# Default: False # Default: False
AltClanLeaderInstantActivation = 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 # Default: 1
DaysBeforeJoinAClan = 1 MinutesBeforeJoinAClan = 1
# Number of days you have to wait before creating a new clan. # Number of days you have to wait before creating a new clan.
# Default: 10 # Default: 10
@ -568,8 +568,8 @@ AltMembersCanWithdrawFromClanWH = False
RemoveCastleCirclets = True RemoveCastleCirclets = True
# Number of members needed to request a clan war. # Number of members needed to request a clan war.
# Default: 15 # Default: 1
AltClanMembersForWar = 15 AltClanMembersForWar = 1
# The the time that player must be online to be counted as online player and registered for clan bonus # The the time that player must be online to be counted as online player and registered for clan bonus
# Default: 30mins # Default: 30mins

4
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/Config.java
View File

@ -268,7 +268,7 @@ public class Config
public static double ALT_GAME_CREATION_RARE_XPSP_RATE; public static double ALT_GAME_CREATION_RARE_XPSP_RATE;
public static double ALT_GAME_CREATION_SP_RATE; public static double ALT_GAME_CREATION_SP_RATE;
public static boolean ALT_CLAN_LEADER_INSTANT_ACTIVATION; 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_CREATE_DAYS;
public static int ALT_CLAN_DISSOLVE_DAYS; public static int ALT_CLAN_DISSOLVE_DAYS;
public static int ALT_ALLY_JOIN_DAYS_WHEN_LEAVED; 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_SP_RATE = characterConfig.getDouble("AltGameCreationSpRate", 1);
ALT_GAME_CREATION_RARE_XPSP_RATE = characterConfig.getDouble("AltGameCreationRareXpSpRate", 2); ALT_GAME_CREATION_RARE_XPSP_RATE = characterConfig.getDouble("AltGameCreationRareXpSpRate", 2);
ALT_CLAN_LEADER_INSTANT_ACTIVATION = characterConfig.getBoolean("AltClanLeaderInstantActivation", false); 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_CREATE_DAYS = characterConfig.getInt("DaysBeforeCreateAClan", 10);
ALT_CLAN_DISSOLVE_DAYS = characterConfig.getInt("DaysToPassToDissolveAClan", 7); ALT_CLAN_DISSOLVE_DAYS = characterConfig.getInt("DaysToPassToDissolveAClan", 7);
ALT_ALLY_JOIN_DAYS_WHEN_LEAVED = characterConfig.getInt("DaysBeforeJoinAllyWhenLeaved", 1); ALT_ALLY_JOIN_DAYS_WHEN_LEAVED = characterConfig.getInt("DaysBeforeJoinAllyWhenLeaved", 1);

4
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/clan/Clan.java
View File

@ -1109,7 +1109,7 @@ public class Clan implements IIdentifiable, INamable
setAllyPenaltyExpiryTime(0, 0); setAllyPenaltyExpiryTime(0, 0);
} }
setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); 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); 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); 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.addString(target.getName());
sm.addInt(Config.ALT_CLAN_JOIN_DAYS); sm.addInt(Config.ALT_CLAN_JOIN_MINS);
player.sendPacket(sm); player.sendPacket(sm);
return false; return false;
} }

4
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
View File

@ -81,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket
} }
// this also updates the database // this also updates the database
clan.removeClanMember(member.getObjectId(), 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_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_MINS * 86400000)); // 60*1000 = 60000
clan.updateClanInDB(); clan.updateClanInDB();
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_DISMISSED_FROM_THE_CLAN); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_DISMISSED_FROM_THE_CLAN);

2
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java
View File

@ -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); 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.addString(player.getName());
sm.addInt(Config.ALT_CLAN_JOIN_DAYS); sm.addInt(Config.ALT_CLAN_JOIN_MINS);
player.sendPacket(sm); player.sendPacket(sm);
return; return;
} }

2
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
View File

@ -62,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
} }
final Clan clan = player.getClan(); 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); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN);
sm.addString(player.getName()); sm.addString(player.getName());

2
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusOpen.java
View File

@ -45,7 +45,7 @@ public class RequestPledgeBonusOpen implements IClientIncomingPacket
} }
player.sendPacket(new ExPledgeBonusOpen(player)); 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())); player.sendPacket(new ExPledgeDonationInfo(player.getClanDonationPoints(), (joinedTime + 86400000) < System.currentTimeMillis()));
} }
} }