Selaa lähdekoodia

another clan lvl 11 support

janiii 15 vuotta sitten
vanhempi
sitoutus
7409d0b79d

+ 52 - 44
L2_GameServer/java/com/l2jserver/gameserver/model/L2Clan.java

@@ -475,57 +475,65 @@ public class L2Clan
 	public int getMaxNrOfMembers(int pledgetype)
 	{
 		int limit = 0;
-
+		
 		switch (pledgetype)
 		{
-		case 0:
-			switch (getLevel())
-			{
-			case 4:
-				limit   = 40;
-				break;
-			case 3:
-				limit   = 30;
+			case 0:
+				switch (getLevel())
+				{
+					case 3:
+						limit = 30;
+						break;
+					case 2:
+						limit = 20;
+						break;
+					case 1:
+						limit = 15;
+						break;
+					case 0:
+						limit = 10;
+						break;
+					default:
+						limit = 40;
+						break;
+				}
 				break;
-			case 2:
-				limit   = 20;
+			case -1:
+				limit = 20;
 				break;
-			case 1:
-				limit   = 15;
+			case 100:
+			case 200:
+				switch (getLevel())
+				{
+					case 11:
+						limit = 30;
+						break;
+					default:
+						limit = 20;
+						break;
+				}
 				break;
-			case 0:
-				limit   = 10;
+			case 1001:
+			case 1002:
+			case 2001:
+			case 2002:
+				switch (getLevel())
+				{
+					case 9:
+					case 10:
+					case 11:
+						limit = 25;
+						break;
+					default:
+						limit = 10;
+						break;
+				}
 				break;
 			default:
-				limit   = 40;
-			break;
-			}
-			break;
-		case -1:
-		case 100:
-		case 200:
-			limit   = 20;
-			break;
-		case 1001:
-		case 1002:
-		case 2001:
-		case 2002:
-			switch (getLevel())
-			{
-				case 9:
-				case 10:
-					limit	= 25;
-					break;
-				default:
-					limit   = 10;
-					break;
-			}
-			break;
-		default:
-			break;
-        }
-
-        return limit;
+				break;
+		}
+		
+		return limit;
 	}
 
 	public L2PcInstance[] getOnlineMembers(int exclude)

+ 254 - 215
L2_GameServer/java/com/l2jserver/gameserver/model/L2ClanMember.java

@@ -366,221 +366,260 @@ public class L2ClanMember
 
 	public int calculatePledgeClass(L2PcInstance player)
 	{
-       int pledgeClass = 0;
-       
-       if (player == null)
-    	   return pledgeClass;
-       
-       L2Clan clan = player.getClan();
-       if (clan != null)
-       {
-           switch (player.getClan().getLevel())
-           {
-               case 4:
-                   if (player.isClanLeader())
-                       pledgeClass = 3;
-                   break;
-               case 5:
-                   if (player.isClanLeader())
-                       pledgeClass = 4;
-                   else
-                       pledgeClass = 2;
-                   break;
-               case 6:
-                   switch (player.getPledgeType())
-                   {
-                       case -1:
-                         pledgeClass = 1;
-                         break;
-                       case 100:
-                       case 200:
-                           pledgeClass = 2;
-                           break;
-                       case 0:
-                           if (player.isClanLeader())
-                               pledgeClass = 5;
-                           else
-                               switch (clan.getLeaderSubPledge(player.getObjectId()))
-                               {
-                                   case 100:
-                                   case 200:
-                                       pledgeClass = 4;
-                                       break;
-                                   case -1:
-                                   default:
-                                       pledgeClass = 3;
-                                       break;
-                               }
-                           break;
-                   }
-                   break;
-               case 7:
-                   switch (player.getPledgeType())
-                   {
-                       case -1:
-                         pledgeClass = 1;
-                         break;
-                       case 100:
-                       case 200:
-                               pledgeClass = 3;
-                           break;
-                       case 1001:
-                       case 1002:
-                       case 2001:
-                       case 2002:
-                               pledgeClass = 2;
-                           break;
-                       case 0:
-                           if (player.isClanLeader())
-                               pledgeClass = 7;
-                           else
-                               switch (clan.getLeaderSubPledge(player.getObjectId()))
-                               {
-                                   case 100:
-                                   case 200:
-                                       pledgeClass = 6;
-                                       break;
-                                   case 1001:
-                                   case 1002:
-                                   case 2001:
-                                   case 2002:
-                                       pledgeClass = 5;
-                                       break;
-                                   case -1:
-                                   default:
-                                       pledgeClass = 4;
-                                       break;
-                               }
-                           break;
-                   }
-                   break;
-               case 8:
-                   switch (player.getPledgeType())
-                   {
-                       case -1:
-                         pledgeClass = 1;
-                         break;
-                       case 100:
-                       case 200:
-                               pledgeClass = 4;
-                           break;
-                       case 1001:
-                       case 1002:
-                       case 2001:
-                       case 2002:
-                               pledgeClass = 3;
-                           break;
-                       case 0:
-                           if (player.isClanLeader())
-                               pledgeClass = 8;
-                           else
-                               switch (clan.getLeaderSubPledge(player.getObjectId()))
-                               {
-                                   case 100:
-                                   case 200:
-                                       pledgeClass = 7;
-                                       break;
-                                   case 1001:
-                                   case 1002:
-                                   case 2001:
-                                   case 2002:
-                                       pledgeClass = 6;
-                                       break;
-                                   case -1:
-                                   default:
-                                       pledgeClass = 5;
-                                       break;
-                               }
-                           break;
-                   }
-                   break;
-           case 9:
-               switch (player.getPledgeType())
-               {
-                   case -1:
-                     pledgeClass = 1;
-                     break;
-                   case 100:
-                   case 200:
-                           pledgeClass = 5;
-                       break;
-                   case 1001:
-                   case 1002:
-                   case 2001:
-                   case 2002:
-                           pledgeClass = 4;
-                       break;
-                   case 0:
-                       if (player.isClanLeader())
-                           pledgeClass = 9;
-                       else
-                           switch (clan.getLeaderSubPledge(player.getObjectId()))
-                           {
-                               case 100:
-                               case 200:
-                                   pledgeClass = 8;
-                                   break;
-                               case 1001:
-                               case 1002:
-                               case 2001:
-                               case 2002:
-                                   pledgeClass = 7;
-                                   break;
-                               case -1:
-                               default:
-                                   pledgeClass = 6;
-                                   break;
-                           }
-                       break;
-               }
-               break;   
-           case 10:
-               switch (player.getPledgeType())
-               {
-                   case -1:
-                     pledgeClass = 1;
-                     break;
-                   case 100:
-                   case 200:
-                           pledgeClass = 6;
-                       break;
-                   case 1001:
-                   case 1002:
-                   case 2001:
-                   case 2002:
-                           pledgeClass = 5;
-                       break;
-                   case 0:
-                       if (player.isClanLeader())
-                           pledgeClass = 10;
-                       else
-                           switch (clan.getLeaderSubPledge(player.getObjectId()))
-                           {
-                               case 100:
-                               case 200:
-                                   pledgeClass = 9;
-                                   break;
-                               case 1001:
-                               case 1002:
-                               case 2001:
-                               case 2002:
-                                   pledgeClass = 8;
-                                   break;
-                               case -1:
-                               default:
-                                   pledgeClass = 7;
-                                   break;
-                           }
-                       break;
-               }
-               break;
-         
-           default:
-               pledgeClass = 1;
-           break;
-       }
-       }
-       return pledgeClass;
+		int pledgeClass = 0;
+		
+		if (player == null)
+			return pledgeClass;
+		
+		L2Clan clan = player.getClan();
+		if (clan != null)
+		{
+			switch (player.getClan().getLevel())
+			{
+				case 4:
+					if (player.isClanLeader())
+						pledgeClass = 3;
+					break;
+				case 5:
+					if (player.isClanLeader())
+						pledgeClass = 4;
+					else
+						pledgeClass = 2;
+					break;
+				case 6:
+					switch (player.getPledgeType())
+					{
+						case -1:
+							pledgeClass = 1;
+							break;
+						case 100:
+						case 200:
+							pledgeClass = 2;
+							break;
+						case 0:
+							if (player.isClanLeader())
+								pledgeClass = 5;
+							else
+								switch (clan.getLeaderSubPledge(player.getObjectId()))
+								{
+									case 100:
+									case 200:
+										pledgeClass = 4;
+										break;
+									case -1:
+									default:
+										pledgeClass = 3;
+										break;
+								}
+							break;
+					}
+					break;
+				case 7:
+					switch (player.getPledgeType())
+					{
+						case -1:
+							pledgeClass = 1;
+							break;
+						case 100:
+						case 200:
+							pledgeClass = 3;
+							break;
+						case 1001:
+						case 1002:
+						case 2001:
+						case 2002:
+							pledgeClass = 2;
+							break;
+						case 0:
+							if (player.isClanLeader())
+								pledgeClass = 7;
+							else
+								switch (clan.getLeaderSubPledge(player.getObjectId()))
+								{
+									case 100:
+									case 200:
+										pledgeClass = 6;
+										break;
+									case 1001:
+									case 1002:
+									case 2001:
+									case 2002:
+										pledgeClass = 5;
+										break;
+									case -1:
+									default:
+										pledgeClass = 4;
+										break;
+								}
+							break;
+					}
+					break;
+				case 8:
+					switch (player.getPledgeType())
+					{
+						case -1:
+							pledgeClass = 1;
+							break;
+						case 100:
+						case 200:
+							pledgeClass = 4;
+							break;
+						case 1001:
+						case 1002:
+						case 2001:
+						case 2002:
+							pledgeClass = 3;
+							break;
+						case 0:
+							if (player.isClanLeader())
+								pledgeClass = 8;
+							else
+								switch (clan.getLeaderSubPledge(player.getObjectId()))
+								{
+									case 100:
+									case 200:
+										pledgeClass = 7;
+										break;
+									case 1001:
+									case 1002:
+									case 2001:
+									case 2002:
+										pledgeClass = 6;
+										break;
+									case -1:
+									default:
+										pledgeClass = 5;
+										break;
+								}
+							break;
+					}
+					break;
+				case 9:
+					switch (player.getPledgeType())
+					{
+						case -1:
+							pledgeClass = 1;
+							break;
+						case 100:
+						case 200:
+							pledgeClass = 5;
+							break;
+						case 1001:
+						case 1002:
+						case 2001:
+						case 2002:
+							pledgeClass = 4;
+							break;
+						case 0:
+							if (player.isClanLeader())
+								pledgeClass = 9;
+							else
+								switch (clan.getLeaderSubPledge(player.getObjectId()))
+								{
+									case 100:
+									case 200:
+										pledgeClass = 8;
+										break;
+									case 1001:
+									case 1002:
+									case 2001:
+									case 2002:
+										pledgeClass = 7;
+										break;
+									case -1:
+									default:
+										pledgeClass = 6;
+										break;
+								}
+							break;
+					}
+					break;
+				case 10:
+					switch (player.getPledgeType())
+					{
+						case -1:
+							pledgeClass = 1;
+							break;
+						case 100:
+						case 200:
+							pledgeClass = 6;
+							break;
+						case 1001:
+						case 1002:
+						case 2001:
+						case 2002:
+							pledgeClass = 5;
+							break;
+						case 0:
+							if (player.isClanLeader())
+								pledgeClass = 10;
+							else
+								switch (clan.getLeaderSubPledge(player.getObjectId()))
+								{
+									case 100:
+									case 200:
+										pledgeClass = 9;
+										break;
+									case 1001:
+									case 1002:
+									case 2001:
+									case 2002:
+										pledgeClass = 8;
+										break;
+									case -1:
+									default:
+										pledgeClass = 7;
+										break;
+								}
+							break;
+					}
+					break;
+				case 11:
+					switch (player.getPledgeType())
+					{
+						case -1:
+							pledgeClass = 1;
+							break;
+						case 100:
+						case 200:
+							pledgeClass = 7;
+							break;
+						case 1001:
+						case 1002:
+						case 2001:
+						case 2002:
+							pledgeClass = 6;
+							break;
+						case 0:
+							if (player.isClanLeader())
+								pledgeClass = 11;
+							else
+								switch (clan.getLeaderSubPledge(player.getObjectId()))
+								{
+									case 100:
+									case 200:
+										pledgeClass = 10;
+										break;
+									case 1001:
+									case 1002:
+									case 2001:
+									case 2002:
+										pledgeClass = 9;
+										break;
+									case -1:
+									default:
+										pledgeClass = 8;
+										break;
+								}
+							break;
+					}
+					break;
+				default:
+					pledgeClass = 1;
+					break;
+			}
+		}
+		return pledgeClass;
 	}
 
 	public void saveApprenticeAndSponsor(int apprentice, int sponsor)