From f8d71d41f3e70d1380f5a6670240976ef773452f Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 2 Jun 2021 22:52:47 +0000 Subject: [PATCH] Updated clan level requirements. Contributed by manax182. --- .../dist/game/config/Feature.ini | 22 ++++++++--------- .../java/org/l2jmobius/Config.java | 24 ++++++++----------- .../dist/game/config/Feature.ini | 22 ++++++++--------- .../java/org/l2jmobius/Config.java | 24 ++++++++----------- .../l2jmobius/gameserver/model/clan/Clan.java | 21 ++++++++-------- 5 files changed, 50 insertions(+), 63 deletions(-) diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/config/Feature.ini b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/config/Feature.ini index ff909138d0..01a7fac22b 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/config/Feature.ini +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/config/Feature.ini @@ -242,20 +242,18 @@ CreateKnightUnitCost = 10000 ReinforceKnightUnitCost = 5000 # Reputation score reduced by increasing clan level. -ClanLevel6Cost = 5000 -ClanLevel7Cost = 10000 -ClanLevel8Cost = 20000 -ClanLevel9Cost = 40000 -ClanLevel10Cost = 40000 -ClanLevel11Cost = 75000 +ClanLevel6Cost = 150000 +ClanLevel7Cost = 450000 +ClanLevel8Cost = 1000000 +ClanLevel9Cost = 2000000 +ClanLevel10Cost = 4000000 # Number of clan members needed to increase clan level. -ClanLevel6Requirement = 30 -ClanLevel7Requirement = 50 -ClanLevel8Requirement = 80 -ClanLevel9Requirement = 120 -ClanLevel10Requirement = 140 -ClanLevel11Requirement = 170 +ClanLevel6Requirement = 40 +ClanLevel7Requirement = 40 +ClanLevel8Requirement = 40 +ClanLevel9Requirement = 40 +ClanLevel10Requirement = 40 # --------------------------------------------------------------------------- # Other diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/Config.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/Config.java index 2389d47386..77fbd8b90b 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/Config.java @@ -416,13 +416,11 @@ public class Config public static int CLAN_LEVEL_8_COST; public static int CLAN_LEVEL_9_COST; public static int CLAN_LEVEL_10_COST; - public static int CLAN_LEVEL_11_COST; public static int CLAN_LEVEL_6_REQUIREMENT; public static int CLAN_LEVEL_7_REQUIREMENT; public static int CLAN_LEVEL_8_REQUIREMENT; public static int CLAN_LEVEL_9_REQUIREMENT; public static int CLAN_LEVEL_10_REQUIREMENT; - public static int CLAN_LEVEL_11_REQUIREMENT; public static boolean ALLOW_WYVERN_ALWAYS; public static boolean ALLOW_WYVERN_DURING_SIEGE; public static boolean ALLOW_MOUNTS_DURING_SIEGE; @@ -1552,18 +1550,16 @@ public class Config LVL_UP_76_AND_80_REP_SCORE = Feature.getInt("LevelUp76And80ReputationScore", 90); LVL_UP_81_PLUS_REP_SCORE = Feature.getInt("LevelUp81PlusReputationScore", 120); LVL_OBTAINED_REP_SCORE_MULTIPLIER = Feature.getDouble("LevelObtainedReputationScoreMultiplier", 1.0d); - CLAN_LEVEL_6_COST = Feature.getInt("ClanLevel6Cost", 5000); - CLAN_LEVEL_7_COST = Feature.getInt("ClanLevel7Cost", 10000); - CLAN_LEVEL_8_COST = Feature.getInt("ClanLevel8Cost", 20000); - CLAN_LEVEL_9_COST = Feature.getInt("ClanLevel9Cost", 40000); - CLAN_LEVEL_10_COST = Feature.getInt("ClanLevel10Cost", 40000); - CLAN_LEVEL_11_COST = Feature.getInt("ClanLevel11Cost", 75000); - CLAN_LEVEL_6_REQUIREMENT = Feature.getInt("ClanLevel6Requirement", 30); - CLAN_LEVEL_7_REQUIREMENT = Feature.getInt("ClanLevel7Requirement", 50); - CLAN_LEVEL_8_REQUIREMENT = Feature.getInt("ClanLevel8Requirement", 80); - CLAN_LEVEL_9_REQUIREMENT = Feature.getInt("ClanLevel9Requirement", 120); - CLAN_LEVEL_10_REQUIREMENT = Feature.getInt("ClanLevel10Requirement", 140); - CLAN_LEVEL_11_REQUIREMENT = Feature.getInt("ClanLevel11Requirement", 170); + CLAN_LEVEL_6_COST = Feature.getInt("ClanLevel6Cost", 15000); + CLAN_LEVEL_7_COST = Feature.getInt("ClanLevel7Cost", 450000); + CLAN_LEVEL_8_COST = Feature.getInt("ClanLevel8Cost", 1000000); + CLAN_LEVEL_9_COST = Feature.getInt("ClanLevel9Cost", 2000000); + CLAN_LEVEL_10_COST = Feature.getInt("ClanLevel10Cost", 4000000); + CLAN_LEVEL_6_REQUIREMENT = Feature.getInt("ClanLevel6Requirement", 40); + CLAN_LEVEL_7_REQUIREMENT = Feature.getInt("ClanLevel7Requirement", 40); + CLAN_LEVEL_8_REQUIREMENT = Feature.getInt("ClanLevel8Requirement", 40); + CLAN_LEVEL_9_REQUIREMENT = Feature.getInt("ClanLevel9Requirement", 40); + CLAN_LEVEL_10_REQUIREMENT = Feature.getInt("ClanLevel10Requirement", 40); ALLOW_WYVERN_ALWAYS = Feature.getBoolean("AllowRideWyvernAlways", false); ALLOW_WYVERN_DURING_SIEGE = Feature.getBoolean("AllowRideWyvernDuringSiege", true); ALLOW_MOUNTS_DURING_SIEGE = Feature.getBoolean("AllowRideMountsDuringSiege", false); diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/config/Feature.ini b/L2J_Mobius_Essence_5.0_Sylph/dist/game/config/Feature.ini index ff909138d0..01a7fac22b 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/config/Feature.ini +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/config/Feature.ini @@ -242,20 +242,18 @@ CreateKnightUnitCost = 10000 ReinforceKnightUnitCost = 5000 # Reputation score reduced by increasing clan level. -ClanLevel6Cost = 5000 -ClanLevel7Cost = 10000 -ClanLevel8Cost = 20000 -ClanLevel9Cost = 40000 -ClanLevel10Cost = 40000 -ClanLevel11Cost = 75000 +ClanLevel6Cost = 150000 +ClanLevel7Cost = 450000 +ClanLevel8Cost = 1000000 +ClanLevel9Cost = 2000000 +ClanLevel10Cost = 4000000 # Number of clan members needed to increase clan level. -ClanLevel6Requirement = 30 -ClanLevel7Requirement = 50 -ClanLevel8Requirement = 80 -ClanLevel9Requirement = 120 -ClanLevel10Requirement = 140 -ClanLevel11Requirement = 170 +ClanLevel6Requirement = 40 +ClanLevel7Requirement = 40 +ClanLevel8Requirement = 40 +ClanLevel9Requirement = 40 +ClanLevel10Requirement = 40 # --------------------------------------------------------------------------- # Other diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/Config.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/Config.java index 1798542eb8..b918eff25f 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/Config.java @@ -416,13 +416,11 @@ public class Config public static int CLAN_LEVEL_8_COST; public static int CLAN_LEVEL_9_COST; public static int CLAN_LEVEL_10_COST; - public static int CLAN_LEVEL_11_COST; public static int CLAN_LEVEL_6_REQUIREMENT; public static int CLAN_LEVEL_7_REQUIREMENT; public static int CLAN_LEVEL_8_REQUIREMENT; public static int CLAN_LEVEL_9_REQUIREMENT; public static int CLAN_LEVEL_10_REQUIREMENT; - public static int CLAN_LEVEL_11_REQUIREMENT; public static boolean ALLOW_WYVERN_ALWAYS; public static boolean ALLOW_WYVERN_DURING_SIEGE; public static boolean ALLOW_MOUNTS_DURING_SIEGE; @@ -1555,18 +1553,16 @@ public class Config LVL_UP_76_AND_80_REP_SCORE = Feature.getInt("LevelUp76And80ReputationScore", 90); LVL_UP_81_PLUS_REP_SCORE = Feature.getInt("LevelUp81PlusReputationScore", 120); LVL_OBTAINED_REP_SCORE_MULTIPLIER = Feature.getDouble("LevelObtainedReputationScoreMultiplier", 1.0d); - CLAN_LEVEL_6_COST = Feature.getInt("ClanLevel6Cost", 5000); - CLAN_LEVEL_7_COST = Feature.getInt("ClanLevel7Cost", 10000); - CLAN_LEVEL_8_COST = Feature.getInt("ClanLevel8Cost", 20000); - CLAN_LEVEL_9_COST = Feature.getInt("ClanLevel9Cost", 40000); - CLAN_LEVEL_10_COST = Feature.getInt("ClanLevel10Cost", 40000); - CLAN_LEVEL_11_COST = Feature.getInt("ClanLevel11Cost", 75000); - CLAN_LEVEL_6_REQUIREMENT = Feature.getInt("ClanLevel6Requirement", 30); - CLAN_LEVEL_7_REQUIREMENT = Feature.getInt("ClanLevel7Requirement", 50); - CLAN_LEVEL_8_REQUIREMENT = Feature.getInt("ClanLevel8Requirement", 80); - CLAN_LEVEL_9_REQUIREMENT = Feature.getInt("ClanLevel9Requirement", 120); - CLAN_LEVEL_10_REQUIREMENT = Feature.getInt("ClanLevel10Requirement", 140); - CLAN_LEVEL_11_REQUIREMENT = Feature.getInt("ClanLevel11Requirement", 170); + CLAN_LEVEL_6_COST = Feature.getInt("ClanLevel6Cost", 15000); + CLAN_LEVEL_7_COST = Feature.getInt("ClanLevel7Cost", 450000); + CLAN_LEVEL_8_COST = Feature.getInt("ClanLevel8Cost", 1000000); + CLAN_LEVEL_9_COST = Feature.getInt("ClanLevel9Cost", 2000000); + CLAN_LEVEL_10_COST = Feature.getInt("ClanLevel10Cost", 4000000); + CLAN_LEVEL_6_REQUIREMENT = Feature.getInt("ClanLevel6Requirement", 40); + CLAN_LEVEL_7_REQUIREMENT = Feature.getInt("ClanLevel7Requirement", 40); + CLAN_LEVEL_8_REQUIREMENT = Feature.getInt("ClanLevel8Requirement", 40); + CLAN_LEVEL_9_REQUIREMENT = Feature.getInt("ClanLevel9Requirement", 40); + CLAN_LEVEL_10_REQUIREMENT = Feature.getInt("ClanLevel10Requirement", 40); ALLOW_WYVERN_ALWAYS = Feature.getBoolean("AllowRideWyvernAlways", false); ALLOW_WYVERN_DURING_SIEGE = Feature.getBoolean("AllowRideWyvernDuringSiege", true); ALLOW_MOUNTS_DURING_SIEGE = Feature.getBoolean("AllowRideMountsDuringSiege", false); diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/clan/Clan.java index 1ec040dd76..077b60a1d7 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -78,11 +78,11 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; import org.l2jmobius.gameserver.network.serverpackets.PledgeSkillList; import org.l2jmobius.gameserver.network.serverpackets.PledgeSkillList.SubPledgeSkill; -import org.l2jmobius.gameserver.network.serverpackets.pledgeV3.ExPledgeLevelUp; -import org.l2jmobius.gameserver.network.serverpackets.pledgeV3.ExPledgeV3Info; import org.l2jmobius.gameserver.network.serverpackets.PledgeSkillListAdd; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV3.ExPledgeLevelUp; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV3.ExPledgeV3Info; import org.l2jmobius.gameserver.network.serverpackets.pledgebonus.ExPledgeBonusMarkReset; import org.l2jmobius.gameserver.util.EnumIntBitmask; import org.l2jmobius.gameserver.util.Util; @@ -160,16 +160,15 @@ public class Clan implements IIdentifiable, INamable private static final int[] EXP_TABLE = { 100, - 1000, - 5000, + 100, + 500, 10000, - 500000, - 1500000, - 4500000, - 7500000, - 11000000, - 14500000, - 20000000 + 50000, + 150000, + 450000, + 1000000, + 2000000, + 4000000 }; private String _notice;