Fixed Kamaels taking opposite sex classes.

Contributed by Sahar.
This commit is contained in:
MobiusDevelopment 2019-10-11 21:32:38 +00:00
parent ee724e03b2
commit 03b59ce3dc
7 changed files with 39 additions and 15 deletions

View File

@ -232,7 +232,7 @@ public enum PlayerClass
subclassSetMap.put(Spellhowler, subclasseSet5);
}
PlayerClass(Race race, ClassType pType, ClassLevel pLevel)
private PlayerClass(Race race, ClassType pType, ClassLevel pLevel)
{
_race = race;
_level = pLevel;
@ -286,11 +286,11 @@ public enum PlayerClass
{
if (player.getAppearance().isFemale())
{
subclasses.removeAll(EnumSet.of(femaleSoulbreaker));
subclasses.removeAll(EnumSet.of(maleSoulbreaker));
}
else
{
subclasses.removeAll(EnumSet.of(maleSoulbreaker));
subclasses.removeAll(EnumSet.of(femaleSoulbreaker));
}
}
if (!player.getSubClasses().containsKey(2) || (player.getSubClasses().get(2).getLevel() < 75))

View File

@ -315,11 +315,15 @@ public enum PlayerClass
switch (player.getRace())
{
case ELF:
{
subclasses.removeAll(getSet(Race.DARK_ELF, THIRD));
break;
}
case DARK_ELF:
{
subclasses.removeAll(getSet(Race.ELF, THIRD));
break;
}
}
subclasses.removeAll(getSet(Race.KAMAEL, THIRD));
@ -343,11 +347,11 @@ public enum PlayerClass
{
if (player.getAppearance().isFemale())
{
subclasses.removeAll(EnumSet.of(femaleSoulbreaker));
subclasses.removeAll(EnumSet.of(maleSoulbreaker));
}
else
{
subclasses.removeAll(EnumSet.of(maleSoulbreaker));
subclasses.removeAll(EnumSet.of(femaleSoulbreaker));
}
}
if (!player.getSubClasses().containsKey(2) || (player.getSubClasses().get(2).getLevel() < 75))

View File

@ -315,11 +315,15 @@ public enum PlayerClass
switch (player.getRace())
{
case ELF:
{
subclasses.removeAll(getSet(Race.DARK_ELF, THIRD));
break;
}
case DARK_ELF:
{
subclasses.removeAll(getSet(Race.ELF, THIRD));
break;
}
}
subclasses.removeAll(getSet(Race.KAMAEL, THIRD));
@ -343,11 +347,11 @@ public enum PlayerClass
{
if (player.getAppearance().isFemale())
{
subclasses.removeAll(EnumSet.of(femaleSoulbreaker));
subclasses.removeAll(EnumSet.of(maleSoulbreaker));
}
else
{
subclasses.removeAll(EnumSet.of(maleSoulbreaker));
subclasses.removeAll(EnumSet.of(femaleSoulbreaker));
}
}
if (!player.getSubClasses().containsKey(2) || (player.getSubClasses().get(2).getLevel() < 75))

View File

@ -315,11 +315,15 @@ public enum PlayerClass
switch (player.getRace())
{
case ELF:
{
subclasses.removeAll(getSet(Race.DARK_ELF, THIRD));
break;
}
case DARK_ELF:
{
subclasses.removeAll(getSet(Race.ELF, THIRD));
break;
}
}
subclasses.removeAll(getSet(Race.KAMAEL, THIRD));
@ -343,11 +347,11 @@ public enum PlayerClass
{
if (player.getAppearance().isFemale())
{
subclasses.removeAll(EnumSet.of(femaleSoulbreaker));
subclasses.removeAll(EnumSet.of(maleSoulbreaker));
}
else
{
subclasses.removeAll(EnumSet.of(maleSoulbreaker));
subclasses.removeAll(EnumSet.of(femaleSoulbreaker));
}
}
if (!player.getSubClasses().containsKey(2) || (player.getSubClasses().get(2).getLevel() < 75))

View File

@ -315,11 +315,15 @@ public enum PlayerClass
switch (player.getRace())
{
case ELF:
{
subclasses.removeAll(getSet(Race.DARK_ELF, THIRD));
break;
}
case DARK_ELF:
{
subclasses.removeAll(getSet(Race.ELF, THIRD));
break;
}
}
subclasses.removeAll(getSet(Race.KAMAEL, THIRD));
@ -343,11 +347,11 @@ public enum PlayerClass
{
if (player.getAppearance().isFemale())
{
subclasses.removeAll(EnumSet.of(femaleSoulbreaker));
subclasses.removeAll(EnumSet.of(maleSoulbreaker));
}
else
{
subclasses.removeAll(EnumSet.of(maleSoulbreaker));
subclasses.removeAll(EnumSet.of(femaleSoulbreaker));
}
}
if (!player.getSubClasses().containsKey(2) || (player.getSubClasses().get(2).getLevel() < 75))

View File

@ -315,11 +315,15 @@ public enum PlayerClass
switch (player.getRace())
{
case ELF:
{
subclasses.removeAll(getSet(Race.DARK_ELF, THIRD));
break;
}
case DARK_ELF:
{
subclasses.removeAll(getSet(Race.ELF, THIRD));
break;
}
}
subclasses.removeAll(getSet(Race.KAMAEL, THIRD));
@ -343,11 +347,11 @@ public enum PlayerClass
{
if (player.getAppearance().isFemale())
{
subclasses.removeAll(EnumSet.of(femaleSoulbreaker));
subclasses.removeAll(EnumSet.of(maleSoulbreaker));
}
else
{
subclasses.removeAll(EnumSet.of(maleSoulbreaker));
subclasses.removeAll(EnumSet.of(femaleSoulbreaker));
}
}
if (!player.getSubClasses().containsKey(2) || (player.getSubClasses().get(2).getLevel() < 75))

View File

@ -315,11 +315,15 @@ public enum PlayerClass
switch (player.getRace())
{
case ELF:
{
subclasses.removeAll(getSet(Race.DARK_ELF, THIRD));
break;
}
case DARK_ELF:
{
subclasses.removeAll(getSet(Race.ELF, THIRD));
break;
}
}
subclasses.removeAll(getSet(Race.KAMAEL, THIRD));
@ -343,11 +347,11 @@ public enum PlayerClass
{
if (player.getAppearance().isFemale())
{
subclasses.removeAll(EnumSet.of(femaleSoulbreaker));
subclasses.removeAll(EnumSet.of(maleSoulbreaker));
}
else
{
subclasses.removeAll(EnumSet.of(maleSoulbreaker));
subclasses.removeAll(EnumSet.of(femaleSoulbreaker));
}
}
if (!player.getSubClasses().containsKey(2) || (player.getSubClasses().get(2).getLevel() < 75))