Subclass Overlord and Warmith aCis

diff --git /config/CustomMods/GeneralsMods.ini
index 869e8a9..9eb714b 100644
--- a/config/CustomMods/GeneralsMods.ini
+++ b/config/CustomMods/GeneralsMods.ini
@@ -10,4 +10,11 @@
 # Example:
 # SkillDurationList = 264,3600; 265,3600; 266,3600; 267,3600; 268,3600; \
 # 363.3600, 364.3600
SkillDurationList = 264,3600
+
+#=============================================================
+#               Enable SubClass OVERLORD Y Warmith
+#=============================================================
+#Liberar subclass overlord e warmith?
+#Retail False
+EnableSubClassOverlordYWarmith = true
\ No newline at end of file
diff --git /java/net/sf/l2j/Config.java
index 41c4977..c8a99b5 100644
--- a/java/net/sf/l2j/Config.java
+++ b/java/net/sf/l2j/Config.java
@@ -993,6 +993,7 @@
 	public static HashMap<Integer, Integer> SKILL_DURATION_LIST;
 	public static boolean ALT_GAME_SUBCLASS_EVERYWHERE;
 	public static boolean ENABLE_CLASS_DARK_Y_ELF;
+	public static boolean ENABLE_CLASS_OVERLORD_Y_WARSMITH;
 	public static boolean ANNOUNCE_BOSS_ALIVE;
 	public static boolean ANNOUNCE_RAIDBOS_KILL;
 	public static boolean ANNOUNCE_GRANDBOS_KILL;
@@ -3043,6 +3044,7 @@
 		final ExProperties GeneralMods = initProperties(Config.GENERALMODS);
 		ALT_GAME_SUBCLASS_EVERYWHERE = GeneralMods.getProperty("AltSubclassAllNpcs", false);
 		ENABLE_CLASS_DARK_Y_ELF = Boolean.parseBoolean(GeneralMods.getProperty("EnableSubClassElfYDark", "False"));
+		ENABLE_CLASS_OVERLORD_Y_WARSMITH = Boolean.parseBoolean(GeneralMods.getProperty("EnableSubClassOverlordYWarmith", "False"));
 		ANNOUNCE_RAIDBOS_KILL = Boolean.parseBoolean(GeneralMods.getProperty("AnnounceRaidBossKill", "false"));
         ANNOUNCE_GRANDBOS_KILL = Boolean.parseBoolean(GeneralMods.getProperty("AnnounceGranBossKill", "false"));
         ANNOUNCE_BOSS_ALIVE =  Boolean.parseBoolean(GeneralMods.getProperty("AnnounceSpawnAllBoss", "false"));
diff --git /java/net/sf/l2j/gameserver/model/base/ClassId.java
index 68e219a..2bede9c 100644
--- a/java/net/sf/l2j/gameserver/model/base/ClassId.java
+++ b/java/net/sf/l2j/gameserver/model/base/ClassId.java
@@ -284,9 +284,12 @@
 			if (classId._level != 2)
 				continue;

-			// Overlord, Warsmith or self class may never be taken as subclass
-			if (classId == OVERLORD || classId == WARSMITH || classId == this)
-				continue;
+			if(!Config.ENABLE_CLASS_OVERLORD_Y_WARSMITH)
+			{
+				// Overlord, Warsmith or self class may never be taken as subclass
+				if (classId == OVERLORD || classId == WARSMITH || classId == this)
+					continue;
+			}

 			if(!Config.ENABLE_CLASS_DARK_Y_ELF)
 			{