Fixed Divine Inspiration auto learned while it should not.
Contributed by Sahar.
This commit is contained in:
parent
52865b814c
commit
cf4371bb97
@ -9514,6 +9514,11 @@ public class PlayerInstance extends Playable
|
|||||||
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
||||||
for (SkillLearn skillInfo : skillTree.values())
|
for (SkillLearn skillInfo : skillTree.values())
|
||||||
{
|
{
|
||||||
|
if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (skillInfo.getGetLevel() <= newClass.getLevel())
|
if (skillInfo.getGetLevel() <= newClass.getLevel())
|
||||||
{
|
{
|
||||||
final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId());
|
final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId());
|
||||||
|
@ -9521,6 +9521,11 @@ public class PlayerInstance extends Playable
|
|||||||
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
||||||
for (SkillLearn skillInfo : skillTree.values())
|
for (SkillLearn skillInfo : skillTree.values())
|
||||||
{
|
{
|
||||||
|
if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (skillInfo.getGetLevel() <= newClass.getLevel())
|
if (skillInfo.getGetLevel() <= newClass.getLevel())
|
||||||
{
|
{
|
||||||
final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId());
|
final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId());
|
||||||
|
@ -9523,6 +9523,11 @@ public class PlayerInstance extends Playable
|
|||||||
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
||||||
for (SkillLearn skillInfo : skillTree.values())
|
for (SkillLearn skillInfo : skillTree.values())
|
||||||
{
|
{
|
||||||
|
if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (skillInfo.getGetLevel() <= newClass.getLevel())
|
if (skillInfo.getGetLevel() <= newClass.getLevel())
|
||||||
{
|
{
|
||||||
final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId());
|
final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId());
|
||||||
|
@ -9514,6 +9514,11 @@ public class PlayerInstance extends Playable
|
|||||||
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
||||||
for (SkillLearn skillInfo : skillTree.values())
|
for (SkillLearn skillInfo : skillTree.values())
|
||||||
{
|
{
|
||||||
|
if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (skillInfo.getGetLevel() <= newClass.getLevel())
|
if (skillInfo.getGetLevel() <= newClass.getLevel())
|
||||||
{
|
{
|
||||||
final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId());
|
final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId());
|
||||||
|
@ -9501,6 +9501,11 @@ public class PlayerInstance extends Playable
|
|||||||
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
||||||
for (SkillLearn skillInfo : skillTree.values())
|
for (SkillLearn skillInfo : skillTree.values())
|
||||||
{
|
{
|
||||||
|
if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (skillInfo.getGetLevel() <= newClass.getLevel())
|
if (skillInfo.getGetLevel() <= newClass.getLevel())
|
||||||
{
|
{
|
||||||
final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId());
|
final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId());
|
||||||
|
@ -9501,6 +9501,11 @@ public class PlayerInstance extends Playable
|
|||||||
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
||||||
for (SkillLearn skillInfo : skillTree.values())
|
for (SkillLearn skillInfo : skillTree.values())
|
||||||
{
|
{
|
||||||
|
if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (skillInfo.getGetLevel() <= newClass.getLevel())
|
if (skillInfo.getGetLevel() <= newClass.getLevel())
|
||||||
{
|
{
|
||||||
final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId());
|
final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId());
|
||||||
|
@ -9502,7 +9502,12 @@ public class PlayerInstance extends Playable
|
|||||||
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
||||||
for (SkillLearn skillInfo : skillTree.values())
|
for (SkillLearn skillInfo : skillTree.values())
|
||||||
{
|
{
|
||||||
if (!Config.AUTO_LEARN_FP_SKILLS && (skillInfo.getSkillId() > 11399) && (skillInfo.getSkillId() < 11405))
|
if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((skillInfo.getSkillId() > 11399) && (skillInfo.getSkillId() < 11405) && !Config.AUTO_LEARN_FP_SKILLS)
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -9483,7 +9483,12 @@ public class PlayerInstance extends Playable
|
|||||||
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
||||||
for (SkillLearn skillInfo : skillTree.values())
|
for (SkillLearn skillInfo : skillTree.values())
|
||||||
{
|
{
|
||||||
if (!Config.AUTO_LEARN_FP_SKILLS && (skillInfo.getSkillId() > 11399) && (skillInfo.getSkillId() < 11405))
|
if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((skillInfo.getSkillId() > 11399) && (skillInfo.getSkillId() < 11405) && !Config.AUTO_LEARN_FP_SKILLS)
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -9455,6 +9455,11 @@ public class PlayerInstance extends Playable
|
|||||||
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
||||||
for (SkillLearn skillInfo : skillTree.values())
|
for (SkillLearn skillInfo : skillTree.values())
|
||||||
{
|
{
|
||||||
|
if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (skillInfo.getGetLevel() <= newClass.getLevel())
|
if (skillInfo.getGetLevel() <= newClass.getLevel())
|
||||||
{
|
{
|
||||||
final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId());
|
final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId());
|
||||||
|
@ -9455,6 +9455,11 @@ public class PlayerInstance extends Playable
|
|||||||
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
||||||
for (SkillLearn skillInfo : skillTree.values())
|
for (SkillLearn skillInfo : skillTree.values())
|
||||||
{
|
{
|
||||||
|
if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (skillInfo.getGetLevel() <= newClass.getLevel())
|
if (skillInfo.getGetLevel() <= newClass.getLevel())
|
||||||
{
|
{
|
||||||
final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId());
|
final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId());
|
||||||
|
@ -9441,6 +9441,11 @@ public class PlayerInstance extends Playable
|
|||||||
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
||||||
for (SkillLearn skillInfo : skillTree.values())
|
for (SkillLearn skillInfo : skillTree.values())
|
||||||
{
|
{
|
||||||
|
if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (skillInfo.getGetLevel() <= newClass.getLevel())
|
if (skillInfo.getGetLevel() <= newClass.getLevel())
|
||||||
{
|
{
|
||||||
final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId());
|
final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId());
|
||||||
|
@ -9468,6 +9468,11 @@ public class PlayerInstance extends Playable
|
|||||||
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
||||||
for (SkillLearn skillInfo : skillTree.values())
|
for (SkillLearn skillInfo : skillTree.values())
|
||||||
{
|
{
|
||||||
|
if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (skillInfo.getGetLevel() <= newClass.getLevel())
|
if (skillInfo.getGetLevel() <= newClass.getLevel())
|
||||||
{
|
{
|
||||||
final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId());
|
final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId());
|
||||||
|
@ -9468,6 +9468,11 @@ public class PlayerInstance extends Playable
|
|||||||
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
||||||
for (SkillLearn skillInfo : skillTree.values())
|
for (SkillLearn skillInfo : skillTree.values())
|
||||||
{
|
{
|
||||||
|
if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (skillInfo.getGetLevel() <= newClass.getLevel())
|
if (skillInfo.getGetLevel() <= newClass.getLevel())
|
||||||
{
|
{
|
||||||
final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId());
|
final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId());
|
||||||
|
@ -9385,6 +9385,11 @@ public class PlayerInstance extends Playable
|
|||||||
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
||||||
for (SkillLearn skillInfo : skillTree.values())
|
for (SkillLearn skillInfo : skillTree.values())
|
||||||
{
|
{
|
||||||
|
if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (skillInfo.getGetLevel() <= newClass.getLevel())
|
if (skillInfo.getGetLevel() <= newClass.getLevel())
|
||||||
{
|
{
|
||||||
final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId());
|
final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId());
|
||||||
|
@ -9467,6 +9467,11 @@ public class PlayerInstance extends Playable
|
|||||||
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
final Map<Integer, Skill> prevSkillList = new HashMap<>();
|
||||||
for (SkillLearn skillInfo : skillTree.values())
|
for (SkillLearn skillInfo : skillTree.values())
|
||||||
{
|
{
|
||||||
|
if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (skillInfo.getGetLevel() <= newClass.getLevel())
|
if (skillInfo.getGetLevel() <= newClass.getLevel())
|
||||||
{
|
{
|
||||||
final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId());
|
final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId());
|
||||||
|
Loading…
Reference in New Issue
Block a user