Browse Source

config for needed members for new clan level, thx burrito

janiii 15 years ago
parent
commit
6c59f6dddb

+ 8 - 1
L2_GameServer/java/config/Feature.properties

@@ -311,4 +311,11 @@ ClanLevel6Cost = 10000
 ClanLevel7Cost = 20000
 ClanLevel7Cost = 20000
 ClanLevel8Cost = 40000
 ClanLevel8Cost = 40000
 ClanLevel9Cost = 40000
 ClanLevel9Cost = 40000
-ClanLevel10Cost = 40000
+ClanLevel10Cost = 40000
+
+# Number of clan members needed to increase clan level.
+ClanLevel6Requirement = 30
+ClanLevel7Requirement = 80
+ClanLevel8Requirement = 120
+ClanLevel9Requirement = 120
+ClanLevel10Requirement = 140

+ 10 - 0
L2_GameServer/java/net/sf/l2j/Config.java

@@ -330,6 +330,11 @@ public final class Config
 	public static int CLAN_LEVEL_8_COST;
 	public static int CLAN_LEVEL_8_COST;
 	public static int CLAN_LEVEL_9_COST;
 	public static int CLAN_LEVEL_9_COST;
 	public static int CLAN_LEVEL_10_COST;
 	public static int CLAN_LEVEL_10_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;
 
 
 
 
 	//--------------------------------------------------
 	//--------------------------------------------------
@@ -1105,6 +1110,11 @@ public final class Config
 					CLAN_LEVEL_8_COST = Integer.parseInt(Feature.getProperty("ClanLevel8Cost", "40000"));
 					CLAN_LEVEL_8_COST = Integer.parseInt(Feature.getProperty("ClanLevel8Cost", "40000"));
 					CLAN_LEVEL_9_COST = Integer.parseInt(Feature.getProperty("ClanLevel9Cost", "40000"));
 					CLAN_LEVEL_9_COST = Integer.parseInt(Feature.getProperty("ClanLevel9Cost", "40000"));
 					CLAN_LEVEL_10_COST = Integer.parseInt(Feature.getProperty("ClanLevel10Cost", "40000"));
 					CLAN_LEVEL_10_COST = Integer.parseInt(Feature.getProperty("ClanLevel10Cost", "40000"));
+					CLAN_LEVEL_6_REQUIREMENT = Integer.parseInt(Feature.getProperty("ClanLevel6Requirement", "30"));
+					CLAN_LEVEL_7_REQUIREMENT = Integer.parseInt(Feature.getProperty("ClanLevel7Requirement", "80"));
+					CLAN_LEVEL_8_REQUIREMENT = Integer.parseInt(Feature.getProperty("ClanLevel8Requirement", "120"));
+					CLAN_LEVEL_9_REQUIREMENT = Integer.parseInt(Feature.getProperty("ClanLevel9Requirement", "120"));
+					CLAN_LEVEL_10_REQUIREMENT = Integer.parseInt(Feature.getProperty("ClanLevel10Requirement", "140"));
 				}
 				}
 				catch (Exception e)
 				catch (Exception e)
 				{
 				{

+ 5 - 5
L2_GameServer/java/net/sf/l2j/gameserver/model/L2Clan.java

@@ -2321,7 +2321,7 @@ public class L2Clan
             }
             }
             case 5:
             case 5:
             	// Upgrade to 6
             	// Upgrade to 6
-                if(getReputationScore() >= Config.CLAN_LEVEL_6_COST && getMembersCount() >= 30)
+                if(getReputationScore() >= Config.CLAN_LEVEL_6_COST && getMembersCount() >= Config.CLAN_LEVEL_6_REQUIREMENT)
                 {
                 {
                     setReputationScore(getReputationScore() - Config.CLAN_LEVEL_6_COST, true);
                     setReputationScore(getReputationScore() - Config.CLAN_LEVEL_6_COST, true);
                     SystemMessage cr = new SystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP);
                     SystemMessage cr = new SystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP);
@@ -2334,7 +2334,7 @@ public class L2Clan
 
 
             case 6:
             case 6:
             	// Upgrade to 7
             	// Upgrade to 7
-                if(getReputationScore() >= Config.CLAN_LEVEL_7_COST && getMembersCount() >= 80)
+                if(getReputationScore() >= Config.CLAN_LEVEL_7_COST && getMembersCount() >= Config.CLAN_LEVEL_7_REQUIREMENT)
                 {
                 {
                     setReputationScore(getReputationScore() - Config.CLAN_LEVEL_7_COST, true);
                     setReputationScore(getReputationScore() - Config.CLAN_LEVEL_7_COST, true);
                     SystemMessage cr = new SystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP);
                     SystemMessage cr = new SystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP);
@@ -2346,7 +2346,7 @@ public class L2Clan
                 break;
                 break;
             case 7:
             case 7:
             	// Upgrade to 8
             	// Upgrade to 8
-                if(getReputationScore() >= Config.CLAN_LEVEL_8_COST && getMembersCount() >= 120)
+                if(getReputationScore() >= Config.CLAN_LEVEL_8_COST && getMembersCount() >= Config.CLAN_LEVEL_8_REQUIREMENT)
                 {
                 {
                     setReputationScore(getReputationScore() - Config.CLAN_LEVEL_8_COST, true);
                     setReputationScore(getReputationScore() - Config.CLAN_LEVEL_8_COST, true);
                     SystemMessage cr = new SystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP);
                     SystemMessage cr = new SystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP);
@@ -2358,7 +2358,7 @@ public class L2Clan
                 break;
                 break;
             case 8:
             case 8:
             	// Upgrade to 9
             	// Upgrade to 9
-                if(getReputationScore() >= Config.CLAN_LEVEL_9_COST && player.getInventory().getItemByItemId(9910) != null && getMembersCount() >= 120)
+                if(getReputationScore() >= Config.CLAN_LEVEL_9_COST && player.getInventory().getItemByItemId(9910) != null && getMembersCount() >= Config.CLAN_LEVEL_9_REQUIREMENT)
                 {
                 {
                 	// itemId 9910 == Blood Oath
                 	// itemId 9910 == Blood Oath
                 	if (player.destroyItemByItemId("ClanLvl", 9910, 150, player.getTarget(), false))
                 	if (player.destroyItemByItemId("ClanLvl", 9910, 150, player.getTarget(), false))
@@ -2378,7 +2378,7 @@ public class L2Clan
                 break;
                 break;
             case 9:
             case 9:
             	// Upgrade to 10
             	// Upgrade to 10
-                if(getReputationScore() >= Config.CLAN_LEVEL_10_COST && player.getInventory().getItemByItemId(9911) != null && getMembersCount() >= 140)
+                if(getReputationScore() >= Config.CLAN_LEVEL_10_COST && player.getInventory().getItemByItemId(9911) != null && getMembersCount() >= Config.CLAN_LEVEL_10_REQUIREMENT)
                 {
                 {
                 	// itemId 9911 == Blood Alliance
                 	// itemId 9911 == Blood Alliance
                 	if (player.destroyItemByItemId("ClanLvl", 9911, 5, player.getTarget(), false))
                 	if (player.destroyItemByItemId("ClanLvl", 9911, 5, player.getTarget(), false))