Attempt to set NPC race by race skill level.

Contributed by ver.
This commit is contained in:
MobiusDevelopment
2021-01-20 23:08:03 +00:00
parent b52b40b2d9
commit 9919e476aa
2 changed files with 20 additions and 12 deletions

View File

@@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.MinionData;
import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate.Race;
import org.l2jmobius.gameserver.model.skills.BaseStat; import org.l2jmobius.gameserver.model.skills.BaseStat;
import org.l2jmobius.gameserver.model.skills.Stat; import org.l2jmobius.gameserver.model.skills.Stat;
@@ -105,18 +106,21 @@ public class NpcTable
final int skillId = npcskills.getInt("skillid"); final int skillId = npcskills.getInt("skillid");
final int level = npcskills.getInt("level"); final int level = npcskills.getInt("level");
if ((npcDat.getRace() == null) && (skillId == 4416))
{
npcDat.setRace(level);
continue;
}
npcSkill = SkillTable.getInstance().getSkill(skillId, level); npcSkill = SkillTable.getInstance().getSkill(skillId, level);
if (npcSkill == null) if (npcSkill == null)
{ {
continue; continue;
} }
if (skillId == 4416)
{
final Race race = npcDat.getRace();
if ((race == null) || (race == Race.UNKNOWN))
{
npcDat.setRace(level);
}
}
npcDat.addSkill(npcSkill); npcDat.addSkill(npcSkill);
} }

View File

@@ -36,6 +36,7 @@ import org.l2jmobius.gameserver.model.MinionData;
import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate.Race;
import org.l2jmobius.gameserver.model.skills.BaseStat; import org.l2jmobius.gameserver.model.skills.BaseStat;
import org.l2jmobius.gameserver.model.skills.Stat; import org.l2jmobius.gameserver.model.skills.Stat;
@@ -105,18 +106,21 @@ public class NpcTable
final int skillId = npcskills.getInt("skillid"); final int skillId = npcskills.getInt("skillid");
final int level = npcskills.getInt("level"); final int level = npcskills.getInt("level");
if ((npcDat.getRace() == null) && (skillId == 4416))
{
npcDat.setRace(level);
continue;
}
npcSkill = SkillTable.getInstance().getSkill(skillId, level); npcSkill = SkillTable.getInstance().getSkill(skillId, level);
if (npcSkill == null) if (npcSkill == null)
{ {
continue; continue;
} }
if (skillId == 4416)
{
final Race race = npcDat.getRace();
if ((race == null) || (race == Race.UNKNOWN))
{
npcDat.setRace(level);
}
}
npcDat.addSkill(npcSkill); npcDat.addSkill(npcSkill);
} }